From fc779ca57ec338c3e4a2b8d0b3a2bac4277bc380 Mon Sep 17 00:00:00 2001
From: Edwin Vane <edwin.vane@intel.com>
Date: Tue, 31 Jan 2012 09:24:51 -0500
Subject: Get JOGL to build with NDK r7

- Most of the android build work is done by gluegen ant files. Changes
  made to gluegen in support of NDK r7 need to be reflected here:
  - New/fewer environment variables.
  - Specifying android.abi for packaging.
- Cross-compilation script cleaned up to look like gluegen's cross
  compile script for consistency.
- Renamed install/re-install adb helper scripts to be ARM specific.
---
 make/build.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'make/build.xml')

diff --git a/make/build.xml b/make/build.xml
index 94fa5acdb..a39707769 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -162,6 +162,7 @@
             jarbasename="jogl.all-android"
             nativebuilddir="${lib}"
             nativebasename=""
+            android.abi="${android.abi}"
             androidmanifest.path="resources/android/AndroidManifest-jogl.xml"
             androidresources.path="resources/android/res-jogl"
             jarmanifest.path="${build.jogl}/manifest.mf"
@@ -183,6 +184,7 @@
             jarbasename="jogl.test"
             nativebuilddir="${lib}"
             nativebasename="non-existing"
+            android.abi="${android.abi}"
             androidmanifest.path="resources/android/AndroidManifest-test.xml"
             androidresources.path="resources/android/res-jogl"
             jarmanifest.path="${build.jogl}/manifest.mf"
@@ -215,6 +217,7 @@
             jarbasename="jogl.android-launcher"
             nativebuilddir="${build}/android/lib"
             nativebasename="non-existing"
+            android.abi="${android.abi}"
             androidmanifest.path="resources/android/AndroidManifest-launcher.xml"
             androidresources.path="resources/android/res-launcher"
             version.code="1"
-- 
cgit v1.2.3