From d51d2aaad01d1c8188193a7913c6ef0fc38ea798 Mon Sep 17 00:00:00 2001 From: Edwin Vane Date: Mon, 30 Jan 2012 15:26:35 -0500 Subject: Changes to make gluegen build with NDK r7 - A bug in cpptasks was getting in the way of a working build with NDK r7. A local patch to cpptasks fixed the bug. - The patch is added as make/lib/cpptasks_gcclinker.patch and applies cleanly to cpptasts @ revision 177. - The result of building cpptasks r177 with this patch is part of the commit as well. - Cleaned up and simplified the android cross-compile script in make/scripts. - Cleaned up arguments passed to gcc for compiling and linking to look more like the command lines used for building NDK samples. - Some differences are necessary as cpptasks won't let us specify any binary other than 'gcc' for building. See gluegen-cpptasks-android-armv7.xml for comments on the matter. - Thinking forward to x86 support, generalized jogamp-androidtasks.xml to install the gluegen shared library in a subdirectory of image/lib named for the targetted ABI for packaging with aapt. This file is no-longer ARM-specific. --- make/build-test.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'make/build-test.xml') diff --git a/make/build-test.xml b/make/build-test.xml index 51b4f83..8c45031 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -143,7 +143,9 @@ androidmanifest.path="resources/android/AndroidManifest-Test.xml" androidresources.path="resources/android/res" version.code="${gluegen_int_version}" - version.name="${gluegen.version.plus}" /> + version.name="${gluegen.version.plus}" + android.abi="${android.abi}" + /> -- cgit v1.2.3