14 files changed, 165 insertions, 65 deletions

diff --git a/lang/gnatdroid-armv5/Makefile b/lang/gnatdroid-armv5/Makefile
index 546cf4354c71..321b81b10b8d 100644
--- a/lang/gnatdroid-armv5/Makefile
+++ b/lang/gnatdroid-armv5/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	armv5
 PORTVERSION=	${SNAPSHOT}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	releases/gcc-${GCC_VERSION}
@@ -17,7 +17,7 @@ COMMENT=	C/Ada cross-compiler, target: Android ARMv5
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	gnatdroid-sysroot>=9:${PORTSDIR}/lang/gnatdroid-sysroot \
+BUILD_DEPENDS=	gnatdroid-sysroot=19:${PORTSDIR}/lang/gnatdroid-sysroot \
 		gnatdroid-binutils>=2.21:${PORTSDIR}/lang/gnatdroid-binutils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
@@ -53,7 +53,7 @@ BUILD_WRKSRC=		${WRKDIR}/build
 PATCHDIR=		${.CURDIR}/../gcc47-aux/files
 CFG_SCRIPT=		${WRKSRC}/configure
 REVFILE=		${WRKSRC}/gcc/REVISION
-SRPREFIX=		${LOCALBASE}/android9
+SRPREFIX=		${LOCALBASE}/android19
 PREFIX=			${SRPREFIX}/${ARMVERSION}
 INSTALLDIRS=		lib libexec share
 INSTALLDIRS+=		${DROID_TARGET}/lib
@@ -154,20 +154,10 @@ pre-install:
 #	Manually rename products so it doesn't rebuild them with new name
 .for X in ${CROSS}
 	${CP} -a ${BUILD_WRKSRC}/gcc/${X}-cross ${BUILD_WRKSRC}/gcc/${X}
-.endfor	
+.endfor
 
 do-install:
 	cd ${BUILD_WRKSRC} && ${GMAKE} install-strip DESTDIR=${STAGEDIR}
-	${MV} ${STAGEDIR}${PREFIX}/bin/${DROID_TARGET}-gcc \
-	   ${STAGEDIR}${PREFIX}/bin/${DROID_TARGET}-gnatgcc
-	${MV} ${STAGEDIR}${PREFIX}/${DROID_TARGET}/bin/gcc \
-	   ${STAGEDIR}${PREFIX}/${DROID_TARGET}/bin/gnatgcc
-.if ${PORT_OPTIONS:MFORT}
-	${MV} ${STAGEDIR}${PREFIX}/bin/${DROID_TARGET}-gfortran \
-	   ${STAGEDIR}${PREFIX}/bin/${DROID_TARGET}-gnatgfortran
-	${MV} ${STAGEDIR}${PREFIX}/${DROID_TARGET}/bin/gfortran \
-	   ${STAGEDIR}${PREFIX}/${DROID_TARGET}/bin/gnatgfortran
-.endif
 
 post-install:
 .for d in ${INSTALLDIRS}
diff --git a/lang/gnatdroid-armv5/files/pkg-message.in b/lang/gnatdroid-armv5/files/pkg-message.in
index 1687fec3d7d4..d11ea339b8c8 100644
--- a/lang/gnatdroid-armv5/files/pkg-message.in
+++ b/lang/gnatdroid-armv5/files/pkg-message.in
@@ -1,4 +1,4 @@
   Add to path: %%PREFIX%%/bin
   All binaries have prefix of %%TARGET%%-
-  e.g. %%TARGET%%-gnatgcc
+  e.g. %%TARGET%%-gcc
        %%TARGET%%-gnatmake
diff --git a/lang/gnatdroid-armv5/pkg-descr b/lang/gnatdroid-armv5/pkg-descr
index f43f948d4a54..ddfbc3b63704 100644
--- a/lang/gnatdroid-armv5/pkg-descr
+++ b/lang/gnatdroid-armv5/pkg-descr
@@ -1,6 +1,7 @@
 The gnatdroid-armv5 port builds a C/Ada cross-compiler based on GCC 4.7 that
-targets the Android operating system (version 2.3, API level 9) running on
+targets the Android operating system (version 4.4, API level 19) running on
 ARM architecture (version 5).  This produces binaries that run natively on
-Android devices as well as the Android SDK emulator.
+Android devices as well as the Android SDK emulator.  Note that 18 the last
+API version supporting ARMv5.
 
 WWW: http://www.dragonlace.net
diff --git a/lang/gnatdroid-armv5/pkg-plist b/lang/gnatdroid-armv5/pkg-plist
index 4179a1122b7a..412273ab0cf7 100644
--- a/lang/gnatdroid-armv5/pkg-plist
+++ b/lang/gnatdroid-armv5/pkg-plist
@@ -1,13 +1,17 @@
+bin/ada
 bin/%%TARGET%%-cpp
 bin/%%TARGET%%-gcc-%%GCCVERS%%
 bin/%%TARGET%%-gcov
+bin/%%TARGET%%-gcc
+bin/%%TARGET%%-gcc-ar
+bin/%%TARGET%%-gcc-nm
+bin/%%TARGET%%-gcc-ranlib
+%%FORT%%bin/%%TARGET%%-gfortran
 bin/%%TARGET%%-gnat
 bin/%%TARGET%%-gnatbind
 bin/%%TARGET%%-gnatchop
 bin/%%TARGET%%-gnatclean
 bin/%%TARGET%%-gnatfind
-bin/%%TARGET%%-gnatgcc
-%%FORT%%bin/%%TARGET%%-gnatgfortran
 bin/%%TARGET%%-gnatkr
 bin/%%TARGET%%-gnatlink
 bin/%%TARGET%%-gnatls
@@ -15,11 +19,11 @@ bin/%%TARGET%%-gnatmake
 bin/%%TARGET%%-gnatname
 bin/%%TARGET%%-gnatprep
 bin/%%TARGET%%-gnatxref
+%%TARGET%%/bin/gcc
+%%FORT%%%%TARGET%%/bin/gfortran
 %%TARGET%%/bin/gnat
 %%TARGET%%/bin/gnatbind
 %%TARGET%%/bin/gnatchop
-%%TARGET%%/bin/gnatgcc
-%%FORT%%%%TARGET%%/bin/gnatgfortran
 %%TARGET%%/bin/gnatkr
 %%TARGET%%/bin/gnatlink
 %%TARGET%%/bin/gnatls
diff --git a/lang/gnatdroid-armv7/Makefile b/lang/gnatdroid-armv7/Makefile
index 91867c9bcb60..756a842a26fa 100644
--- a/lang/gnatdroid-armv7/Makefile
+++ b/lang/gnatdroid-armv7/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	armv7
 PORTVERSION=	${SNAPSHOT}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	releases/gcc-${GCC_VERSION}
@@ -17,7 +17,7 @@ COMMENT=	C/Ada cross-compiler, target: Android ARMv7
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	gnatdroid-sysroot>=9:${PORTSDIR}/lang/gnatdroid-sysroot \
+BUILD_DEPENDS=	gnatdroid-sysroot=19:${PORTSDIR}/lang/gnatdroid-sysroot \
 		gnatdroid-binutils>=2.21:${PORTSDIR}/lang/gnatdroid-binutils
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
@@ -53,7 +53,7 @@ BUILD_WRKSRC=		${WRKDIR}/build
 PATCHDIR=		${.CURDIR}/../gcc47-aux/files
 CFG_SCRIPT=		${WRKSRC}/configure
 REVFILE=		${WRKSRC}/gcc/REVISION
-SRPREFIX=		${LOCALBASE}/android9
+SRPREFIX=		${LOCALBASE}/android19
 PREFIX=			${SRPREFIX}/${ARMVERSION}
 INSTALLDIRS=		lib libexec share
 INSTALLDIRS+=		${DROID_TARGET}/lib
@@ -154,20 +154,10 @@ pre-install:
 #	Manually rename products so it doesn't rebuild them with new name
 .for X in ${CROSS}
 	${CP} -a ${BUILD_WRKSRC}/gcc/${X}-cross ${BUILD_WRKSRC}/gcc/${X}
-.endfor	
+.endfor
 
 do-install:
 	cd ${BUILD_WRKSRC} && ${GMAKE} install-strip DESTDIR=${STAGEDIR}
-	${MV} ${STAGEDIR}${PREFIX}/bin/${DROID_TARGET}-gcc \
-	   ${STAGEDIR}${PREFIX}/bin/${DROID_TARGET}-gnatgcc
-	${MV} ${STAGEDIR}${PREFIX}/${DROID_TARGET}/bin/gcc \
-	   ${STAGEDIR}${PREFIX}/${DROID_TARGET}/bin/gnatgcc
-.if ${PORT_OPTIONS:MFORT}
-	${MV} ${STAGEDIR}${PREFIX}/bin/${DROID_TARGET}-gfortran \
-	   ${STAGEDIR}${PREFIX}/bin/${DROID_TARGET}-gnatgfortran
-	${MV} ${STAGEDIR}${PREFIX}/${DROID_TARGET}/bin/gfortran \
-	   ${STAGEDIR}${PREFIX}/${DROID_TARGET}/bin/gnatgfortran
-.endif
 
 post-install:
 .for d in ${INSTALLDIRS}
diff --git a/lang/gnatdroid-armv7/files/pkg-message.in b/lang/gnatdroid-armv7/files/pkg-message.in
index 1687fec3d7d4..d11ea339b8c8 100644
--- a/lang/gnatdroid-armv7/files/pkg-message.in
+++ b/lang/gnatdroid-armv7/files/pkg-message.in
@@ -1,4 +1,4 @@
   Add to path: %%PREFIX%%/bin
   All binaries have prefix of %%TARGET%%-
-  e.g. %%TARGET%%-gnatgcc
+  e.g. %%TARGET%%-gcc
        %%TARGET%%-gnatmake
diff --git a/lang/gnatdroid-armv7/pkg-descr b/lang/gnatdroid-armv7/pkg-descr
index 70f0fcdbc35b..0d702cebad4d 100644
--- a/lang/gnatdroid-armv7/pkg-descr
+++ b/lang/gnatdroid-armv7/pkg-descr
@@ -1,5 +1,5 @@
 The gnatdroid-armv7 port builds a C/Ada cross-compiler based on GCC 4.7 that
-targets the Android operating system (version 2.3, API level 9) running on
+targets the Android operating system (version 4.4, API level 19) running on
 ARM architecture (version 7).  This produces binaries that run natively on
 Android devices built with Cortex-A series chips.
 
diff --git a/lang/gnatdroid-armv7/pkg-plist b/lang/gnatdroid-armv7/pkg-plist
index 4179a1122b7a..412273ab0cf7 100644
--- a/lang/gnatdroid-armv7/pkg-plist
+++ b/lang/gnatdroid-armv7/pkg-plist
@@ -1,13 +1,17 @@
+bin/ada
 bin/%%TARGET%%-cpp
 bin/%%TARGET%%-gcc-%%GCCVERS%%
 bin/%%TARGET%%-gcov
+bin/%%TARGET%%-gcc
+bin/%%TARGET%%-gcc-ar
+bin/%%TARGET%%-gcc-nm
+bin/%%TARGET%%-gcc-ranlib
+%%FORT%%bin/%%TARGET%%-gfortran
 bin/%%TARGET%%-gnat
 bin/%%TARGET%%-gnatbind
 bin/%%TARGET%%-gnatchop
 bin/%%TARGET%%-gnatclean
 bin/%%TARGET%%-gnatfind
-bin/%%TARGET%%-gnatgcc
-%%FORT%%bin/%%TARGET%%-gnatgfortran
 bin/%%TARGET%%-gnatkr
 bin/%%TARGET%%-gnatlink
 bin/%%TARGET%%-gnatls
@@ -15,11 +19,11 @@ bin/%%TARGET%%-gnatmake
 bin/%%TARGET%%-gnatname
 bin/%%TARGET%%-gnatprep
 bin/%%TARGET%%-gnatxref
+%%TARGET%%/bin/gcc
+%%FORT%%%%TARGET%%/bin/gfortran
 %%TARGET%%/bin/gnat
 %%TARGET%%/bin/gnatbind
 %%TARGET%%/bin/gnatchop
-%%TARGET%%/bin/gnatgcc
-%%FORT%%%%TARGET%%/bin/gnatgfortran
 %%TARGET%%/bin/gnatkr
 %%TARGET%%/bin/gnatlink
 %%TARGET%%/bin/gnatls
diff --git a/lang/gnatdroid-binutils/Makefile b/lang/gnatdroid-binutils/Makefile
index 5c6442ae3154..05b8183d754a 100644
--- a/lang/gnatdroid-binutils/Makefile
+++ b/lang/gnatdroid-binutils/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=		binutils
 PORTVERSION=		2.24
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_SOURCEWARE}
 MASTER_SITE_SUBDIR=	binutils/releases
@@ -15,18 +15,19 @@ COMMENT=	Infrastructure for C/Ada Android cross-compiler
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	gnatdroid-sysroot>=9:${PORTSDIR}/lang/gnatdroid-sysroot \
+BUILD_DEPENDS=	gnatdroid-sysroot=19:${PORTSDIR}/lang/gnatdroid-sysroot \
 		${LOCALBASE}/lib/libgmp.so:${PORTSDIR}/math/gmp \
 		${LOCALBASE}/lib/libmpfr.so:${PORTSDIR}/math/mpfr
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		gmake
-USE_BZIP2=	YES
-HAS_CONFIGURE=	YES
-NO_MTREE=	YES
+USES=		gmake tar:bzip2
+HAS_CONFIGURE=	yes
+NO_MTREE=	yes
+
+NO_LICENSES_INSTALL= yes
 
 WRKSRC=			${WRKDIR}/binutils-${PORTVERSION}
-PREFIX=			${LOCALBASE}/android9
+PREFIX=			${LOCALBASE}/android19
 BRANCH1=		ARMv5
 BRANCH2=		ARMv7
 BR1_PREFIX=		${PREFIX}/${BRANCH1}
diff --git a/lang/gnatdroid-binutils/pkg-plist b/lang/gnatdroid-binutils/pkg-plist
index 70d273aa4f39..3f8ee020efca 100644
--- a/lang/gnatdroid-binutils/pkg-plist
+++ b/lang/gnatdroid-binutils/pkg-plist
@@ -112,4 +112,3 @@
 @dirrm %%BRANCH2%%/%%TARGET%%
 @dirrm %%BRANCH2%%/bin
 @dirrm %%BRANCH2%%
-@dirrmtry share
diff --git a/lang/gnatdroid-sysroot/Makefile b/lang/gnatdroid-sysroot/Makefile
index 6b6ff1b14c00..152c67fd81e9 100644
--- a/lang/gnatdroid-sysroot/Makefile
+++ b/lang/gnatdroid-sysroot/Makefile
@@ -2,25 +2,24 @@
 # $FreeBSD$
 
 PORTNAME=	sysroot
-PORTVERSION=	9
+PORTVERSION=	19
 CATEGORIES=	lang
 MASTER_SITES=	http://downloads.dragonlace.net/src/
 PKGNAMEPREFIX=	gnatdroid-
-DISTNAME=	android-9-arm
+DISTNAME=	android-${PORTVERSION}-arm
 
 MAINTAINER=	marino@FreeBSD.org
-COMMENT=	Android-9 sysroot for C/Ada Android cross-compiler
+COMMENT=	Android-${PORTVERSION} sysroot for C/Ada Android cross-compiler
 
-USE_BZIP2=	YES
+USES=		tar:bzip2
 NO_BUILD=	YES
 NO_MTREE=	YES
 
 WRKSRC=		${WRKDIR}/android-${PORTVERSION}-arm
-PREFIX=		${LOCALBASE}/android9
+PREFIX=		${LOCALBASE}/android${PORTVERSION}
 
 do-install:
-	(cd ${WRKSRC} && ${FIND} usr/ -type d -exec ${MKDIR} ${STAGEDIR}${PREFIX}/{} \;)
-	(cd ${WRKSRC} && ${FIND} usr/ -type f -exec \
-	   ${INSTALL} -p -o root -g wheel ${WRKSRC}/{} ${STAGEDIR}${PREFIX}/{} \;)
+	@${MKDIR} ${STAGEDIR}${PREFIX}
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} usr ${STAGEDIR}${PREFIX})
 
 .include <bsd.port.mk>
diff --git a/lang/gnatdroid-sysroot/distinfo b/lang/gnatdroid-sysroot/distinfo
index 2c7b2a2ab8fe..1237764aecf7 100644
--- a/lang/gnatdroid-sysroot/distinfo
+++ b/lang/gnatdroid-sysroot/distinfo
@@ -1,2 +1,2 @@
-SHA256 (android-9-arm.tar.bz2) = 682cee5219f171a8bf4d0b35a33bc00d265a8c5a0b1d81ddd04389b402783190
-SIZE (android-9-arm.tar.bz2) = 1924233
+SHA256 (android-19-arm.tar.bz2) = 734b37fa2c3aff05540ce9d8c73d0ad92623b281f0e267a05fd2f0c3a86e08ea
+SIZE (android-19-arm.tar.bz2) = 4621476
diff --git a/lang/gnatdroid-sysroot/pkg-descr b/lang/gnatdroid-sysroot/pkg-descr
index 21a51b51c032..d782ce5469ca 100644
--- a/lang/gnatdroid-sysroot/pkg-descr
+++ b/lang/gnatdroid-sysroot/pkg-descr
@@ -1,5 +1,5 @@
 This package is used by lang/gnatdroid to install the system root of
-Android 2.3 (API Level 9) of the ARM architecture. The ARM cross-tools
+Android 4.4 (API Level 19) of the ARM architecture. The ARM cross-tools
 are built using these files, which in turn is required for the GNAT
 FreeBSD->ARM cross-compiler that is gnatdroid.
 
diff --git a/lang/gnatdroid-sysroot/pkg-plist b/lang/gnatdroid-sysroot/pkg-plist
index 3724d3b8c0ba..dfde9d184633 100644
--- a/lang/gnatdroid-sysroot/pkg-plist
+++ b/lang/gnatdroid-sysroot/pkg-plist
@@ -7,10 +7,17 @@ usr/include/GLES/glplatform.h
 usr/include/GLES2/gl2.h
 usr/include/GLES2/gl2ext.h
 usr/include/GLES2/gl2platform.h
+usr/include/GLES3/gl3.h
+usr/include/GLES3/gl3ext.h
+usr/include/GLES3/gl3platform.h
 usr/include/KHR/khrplatform.h
+usr/include/OMXAL/OpenMAXAL.h
+usr/include/OMXAL/OpenMAXAL_Android.h
+usr/include/OMXAL/OpenMAXAL_Platform.h
 usr/include/SLES/OpenSLES.h
 usr/include/SLES/OpenSLES_Android.h
 usr/include/SLES/OpenSLES_AndroidConfiguration.h
+usr/include/SLES/OpenSLES_AndroidMetadata.h
 usr/include/SLES/OpenSLES_Platform.h
 usr/include/alloca.h
 usr/include/android/api-level.h
@@ -29,6 +36,7 @@ usr/include/android/obb.h
 usr/include/android/rect.h
 usr/include/android/sensor.h
 usr/include/android/storage_manager.h
+usr/include/android/tts.h
 usr/include/android/window.h
 usr/include/arpa/inet.h
 usr/include/arpa/nameser.h
@@ -54,9 +62,11 @@ usr/include/asm-generic/ioctl.h
 usr/include/asm-generic/ipc.h
 usr/include/asm-generic/local.h
 usr/include/asm-generic/memory_model.h
+usr/include/asm-generic/mman-common.h
 usr/include/asm-generic/mman.h
 usr/include/asm-generic/mutex-xchg.h
 usr/include/asm-generic/percpu.h
+usr/include/asm-generic/pgtable-nopmd.h
 usr/include/asm-generic/pgtable-nopud.h
 usr/include/asm-generic/pgtable.h
 usr/include/asm-generic/poll.h
@@ -64,6 +74,8 @@ usr/include/asm-generic/resource.h
 usr/include/asm-generic/sections.h
 usr/include/asm-generic/siginfo.h
 usr/include/asm-generic/signal.h
+usr/include/asm-generic/socket.h
+usr/include/asm-generic/swab.h
 usr/include/asm-generic/tlb.h
 usr/include/asm-generic/topology.h
 usr/include/asm-generic/xor.h
@@ -186,6 +198,7 @@ usr/include/jni.h
 usr/include/lastlog.h
 usr/include/libgen.h
 usr/include/limits.h
+usr/include/link.h
 usr/include/linux/a.out.h
 usr/include/linux/aio_abi.h
 usr/include/linux/akm8976.h
@@ -303,6 +316,7 @@ usr/include/linux/ip.h
 usr/include/linux/ipc.h
 usr/include/linux/ipmi_msgdefs.h
 usr/include/linux/ipmi_smi.h
+usr/include/linux/ipv6.h
 usr/include/linux/ipx.h
 usr/include/linux/irq.h
 usr/include/linux/irq_cpustat.h
@@ -624,6 +638,7 @@ usr/include/machine/_types.h
 usr/include/machine/asm.h
 usr/include/machine/cdefs.h
 usr/include/machine/cpu-features.h
+usr/include/machine/endian.h
 usr/include/machine/exec.h
 usr/include/machine/ieee.h
 usr/include/machine/internal_types.h
@@ -636,10 +651,10 @@ usr/include/memory.h
 usr/include/mntent.h
 usr/include/mtd/mtd-abi.h
 usr/include/mtd/mtd-user.h
+usr/include/net/ethernet.h
 usr/include/net/ethertypes.h
 usr/include/net/if.h
 usr/include/net/if_arp.h
-usr/include/net/if_dl.h
 usr/include/net/if_ether.h
 usr/include/net/if_ieee1394.h
 usr/include/net/if_packet.h
@@ -647,11 +662,13 @@ usr/include/net/if_types.h
 usr/include/net/route.h
 usr/include/netdb.h
 usr/include/netinet/ether.h
+usr/include/netinet/icmp6.h
 usr/include/netinet/if_ether.h
 usr/include/netinet/in.h
 usr/include/netinet/in6.h
 usr/include/netinet/in_systm.h
 usr/include/netinet/ip.h
+usr/include/netinet/ip6.h
 usr/include/netinet/ip_icmp.h
 usr/include/netinet/tcp.h
 usr/include/netinet/udp.h
@@ -664,6 +681,85 @@ usr/include/pthread.h
 usr/include/pwd.h
 usr/include/regex.h
 usr/include/resolv.h
+usr/include/rs/cpp/RenderScript.h
+usr/include/rs/cpp/rsCppInternal.h
+usr/include/rs/cpp/rsCppStructs.h
+usr/include/rs/cpp/rsDispatch.h
+usr/include/rs/cpp/util/RefBase.h
+usr/include/rs/cpp/util/StrongPointer.h
+usr/include/rs/cpp/util/TypeHelpers.h
+usr/include/rs/rs.h
+usr/include/rs/rs.spec
+usr/include/rs/rsAdapter.h
+usr/include/rs/rsAllocation.h
+usr/include/rs/rsAnimation.h
+usr/include/rs/rsCompatibilityLib.h
+usr/include/rs/rsComponent.h
+usr/include/rs/rsContext.h
+usr/include/rs/rsCppUtils.h
+usr/include/rs/rsDebugHelper.h
+usr/include/rs/rsDefines.h
+usr/include/rs/rsDevice.h
+usr/include/rs/rsElement.h
+usr/include/rs/rsEnv.h
+usr/include/rs/rsFBOCache.h
+usr/include/rs/rsFifo.h
+usr/include/rs/rsFifoSocket.h
+usr/include/rs/rsFileA3D.h
+usr/include/rs/rsFont.h
+usr/include/rs/rsGrallocConsumer.h
+usr/include/rs/rsMatrix2x2.h
+usr/include/rs/rsMatrix3x3.h
+usr/include/rs/rsMatrix4x4.h
+usr/include/rs/rsMesh.h
+usr/include/rs/rsMutex.h
+usr/include/rs/rsObjectBase.h
+usr/include/rs/rsPath.h
+usr/include/rs/rsProgram.h
+usr/include/rs/rsProgramBase.h
+usr/include/rs/rsProgramFragment.h
+usr/include/rs/rsProgramRaster.h
+usr/include/rs/rsProgramStore.h
+usr/include/rs/rsProgramVertex.h
+usr/include/rs/rsRuntime.h
+usr/include/rs/rsSampler.h
+usr/include/rs/rsScript.h
+usr/include/rs/rsScriptC.h
+usr/include/rs/rsScriptGroup.h
+usr/include/rs/rsScriptIntrinsic.h
+usr/include/rs/rsSignal.h
+usr/include/rs/rsStream.h
+usr/include/rs/rsThreadIO.h
+usr/include/rs/rsType.h
+usr/include/rs/rsUtils.h
+usr/include/rs/rs_hal.h
+usr/include/rs/rs_native.spec
+usr/include/rs/rsg.spec
+usr/include/rs/rsgApi.cpp.rsg
+usr/include/rs/rsgApiFuncDecl.h.rsg
+usr/include/rs/rsgApiReplay.cpp.rsg
+usr/include/rs/rsgApiStructs.h.rsg
+usr/include/rs/scriptc/rs_allocation.rsh
+usr/include/rs/scriptc/rs_atomic.rsh
+usr/include/rs/scriptc/rs_cl.rsh
+usr/include/rs/scriptc/rs_core.rsh
+usr/include/rs/scriptc/rs_debug.rsh
+usr/include/rs/scriptc/rs_element.rsh
+usr/include/rs/scriptc/rs_graphics.rsh
+usr/include/rs/scriptc/rs_math.rsh
+usr/include/rs/scriptc/rs_matrix.rsh
+usr/include/rs/scriptc/rs_mesh.rsh
+usr/include/rs/scriptc/rs_object.rsh
+usr/include/rs/scriptc/rs_program.rsh
+usr/include/rs/scriptc/rs_quaternion.rsh
+usr/include/rs/scriptc/rs_sampler.rsh
+usr/include/rs/scriptc/rs_time.rsh
+usr/include/rs/scriptc/rs_types.rsh
+usr/include/rs/server/RefBase.h
+usr/include/rs/server/StrongPointer.h
+usr/include/rs/server/TypeHelpers.h
+usr/include/rs/spec.h
+usr/include/rs/spec.l
 usr/include/sched.h
 usr/include/semaphore.h
 usr/include/setjmp.h
@@ -679,13 +775,16 @@ usr/include/sys/_errdefs.h
 usr/include/sys/_sigdefs.h
 usr/include/sys/_system_properties.h
 usr/include/sys/_types.h
+usr/include/sys/_wchar_limits.h
 usr/include/sys/atomics.h
+usr/include/sys/cachectl.h
 usr/include/sys/cdefs.h
 usr/include/sys/cdefs_elf.h
 usr/include/sys/dirent.h
 usr/include/sys/endian.h
 usr/include/sys/epoll.h
 usr/include/sys/errno.h
+usr/include/sys/eventfd.h
 usr/include/sys/exec_elf.h
 usr/include/sys/file.h
 usr/include/sys/fsuid.h
@@ -696,7 +795,6 @@ usr/include/sys/ipc.h
 usr/include/sys/klog.h
 usr/include/sys/limits.h
 usr/include/sys/linux-syscalls.h
-usr/include/sys/linux-unistd.h
 usr/include/sys/mman.h
 usr/include/sys/mount.h
 usr/include/sys/param.h
@@ -753,6 +851,8 @@ usr/lib/crtend_so.o
 usr/lib/libEGL.so
 usr/lib/libGLESv1_CM.so
 usr/lib/libGLESv2.so
+usr/lib/libGLESv3.so
+usr/lib/libOpenMAXAL.so
 usr/lib/libOpenSLES.so
 usr/lib/libandroid.so
 usr/lib/libc.a
@@ -762,13 +862,23 @@ usr/lib/libjnigraphics.so
 usr/lib/liblog.so
 usr/lib/libm.a
 usr/lib/libm.so
+usr/lib/libm_hard.a
 usr/lib/libstdc++.a
 usr/lib/libstdc++.so
-usr/lib/libthread_db.a
 usr/lib/libthread_db.so
 usr/lib/libz.so
+usr/lib/rs/libRSSupport.so
+usr/lib/rs/libRScpp_static.a
+usr/lib/rs/libclcore.bc
+usr/lib/rs/libcompiler_rt.a
+@dirrm usr/lib/rs
 @dirrm usr/lib
 @dirrm usr/include/sys
+@dirrm usr/include/rs/server
+@dirrm usr/include/rs/scriptc
+@dirrm usr/include/rs/cpp/util
+@dirrm usr/include/rs/cpp
+@dirrm usr/include/rs
 @dirrm usr/include/netpacket
 @dirrm usr/include/netinet
 @dirrm usr/include/net
@@ -787,16 +897,18 @@ usr/lib/libz.so
 @dirrm usr/include/linux/hdlc
 @dirrm usr/include/linux/byteorder
 @dirrm usr/include/linux
+@dirrm usr/include/asm/arch
 @dirrm usr/include/asm-generic/bitops
 @dirrm usr/include/asm-generic
-@dirrm usr/include/asm/arch
 @dirrm usr/include/asm
 @dirrm usr/include/arpa
 @dirrm usr/include/android
 @dirrm usr/include/SLES
+@dirrm usr/include/OMXAL
 @dirrm usr/include/KHR
+@dirrm usr/include/GLES3
 @dirrm usr/include/GLES2
 @dirrm usr/include/GLES
 @dirrm usr/include/EGL
 @dirrm usr/include
-@dirrm usr/
+@dirrm usr