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-nativewindow.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'make/build-nativewindow.xml')

diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index c66a92d09..c3a916804 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -400,9 +400,9 @@
       </linker>
 
       <linker id="linker.cfg.linux.armv7.nativewindow.x11" extends="linker.cfg.linux.armv7">
-        <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="X11" />
-        <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xxf86vm" />
-        <syslibset dir="${env.TARGET_PLATFORM_LIBS}" libs="Xrender" />
+        <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11" />
+        <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xxf86vm" />
+        <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xrender" />
       </linker>
 
       <linker id="linker.cfg.solaris.nativewindow.x11" extends="linker.cfg.solaris">
-- 
cgit v1.2.3