Bug 1417 - Android: Complete 1st round: make/lib/gluegen-cpptask-android-<abi>.xml and scripts

All aligned now
- gluegen-cpptasks-android-aarch64.xml
- gluegen-cpptasks-android-armv6.xml (this has ld flag --no-undefined disabled, due to internal missing symbols)
- gluegen-cpptasks-android-x86.xml

1 files changed, 21 insertions, 29 deletions

diff --git a/make/lib/gluegen-cpptasks-android-aarch64.xml b/make/lib/gluegen-cpptasks-android-aarch64.xml
index 4b6401b..2ebe9ee 100644
--- a/make/lib/gluegen-cpptasks-android-aarch64.xml
+++ b/make/lib/gluegen-cpptasks-android-aarch64.xml
@@ -35,18 +35,17 @@
     <compiler id="compiler.cfg.android" name="clang">
       <compilerarg value="--sysroot=${env.ANDROID_TOOLCHAIN_SYSROOT}" />
 
-      <!-- compilerarg value="-v" / --> 
+      <compilerarg value="-v" /> 
 
       <compilerarg value="-fpic" /> 
-      <!-- compilerarg value="-fPIE" / -->  <!-- not for shared libs, won't produce symbols -->
-      <!-- compilerarg value="-pie" / -->   <!-- not for shared libs, won't produce symbols -->
 
       <!-- from sdk cmake start -->
       <compilerarg value="-fdata-sections" />
       <compilerarg value="-ffunction-sections" />
       <compilerarg value="-funwind-tables" />
       <compilerarg value="-fstack-protector-strong" />
-      <!-- compilerarg value="-no-canonical-prefixes" / --> <!-- will disallow creating shared library -->
+      <compilerarg value="-no-canonical-prefixes" />
+      <compilerarg value="-nostdinc++" />
       <!-- from sdk cmake end -->
 
       <compilerarg value="-Wa,--noexecstack" /> 
@@ -59,25 +58,21 @@
       <!-- compilerarg value="-mfloat-abi=softfp" / -->
 
       <!-- Generic ARM Flags -->
+      <compilerarg value="-fno-strict-aliasing"/> <!-- be safe -->
+
       <compilerarg value="-O2"                  unless="c.compiler.use-debug" /> 
       <!-- compilerarg value="-g"                   unless="c.compiler.use-debug" / -->
       <compilerarg value="-fomit-frame-pointer" unless="c.compiler.use-debug"/> 
-      <compilerarg value="-fstrict-aliasing"    unless="c.compiler.use-debug"/> 
       <!-- compilerarg value="-funswitch-loops"     unless="c.compiler.use-debug"/ not supported --> 
       <!-- compilerarg value="-finline-limit=300"   unless="c.compiler.use-debug"/ not supported --> 
 
       <compilerarg value="-O0"                     if="c.compiler.use-debug" />
       <compilerarg value="-g"                      if="c.compiler.use-debug" />
       <compilerarg value="-fno-omit-frame-pointer" if="c.compiler.use-debug" /> 
-      <compilerarg value="-fno-strict-aliasing"    if="c.compiler.use-debug" /> 
 
       <!-- includepath path="${env.ANDROID_TOOLCHAIN_SYSROOT_INC}" / -->
       <defineset>
         <define name="__unix__" />
-        <!-- define name="__ARM_ARCH_5__" />
-        <define name="__ARM_ARCH_5T__" />
-        <define name="__ARM_ARCH_5E__" />
-        <define name="__ARM_ARCH_5TE__" / -->
         <define name="__LP64__" />     <!-- default pre-defined macro for 64bit unix -->
         <define name="__aarch64__" />  <!-- default pre-defined macro for armv8-a, 64bit -->
 
@@ -90,39 +85,36 @@
 
     <linker id="linker.cfg.android" name="clang">
       <linkerarg value="--sysroot=${env.ANDROID_TOOLCHAIN_SYSROOT}" />
-      <!-- linkerarg value="-Wl,-L,${env.ANDROID_TOOLCHAIN_SYSROOT_LIB_0}" / -->
-      <linkerarg value="-Wl,-L,${env.ANDROID_TOOLCHAIN_SYSROOT_LIB_1}" />
+      <!-- linkerarg value="-L${env.ANDROID_TOOLCHAIN_SYSROOT_LIB_0}" / -->
+      <linkerarg value="-L${env.ANDROID_TOOLCHAIN_SYSROOT_LIB_1}" />
+      <linkerarg value="-Wl,-rpath-link=${env.ANDROID_TOOLCHAIN_SYSROOT_LIB_1}" />
       
-      <!-- linkerarg value="-v" / --> 
+      <linkerarg value="-v" /> 
 
       <linkerarg value="-fpic" /> 
-      <!-- linkerarg value="-fPIE" / --> <!-- not for shared libs, won't produce symbols -->
-      <!-- linkerarg value="-pie" / -->  <!-- not for shared libs, won't produce symbols -->
-      <!-- linkerarg value="-no-canonical-prefixes" / --> <!-- will disallow creating shared library -->
 
       <!-- from sdk cmake start -->
       <linkerarg value="-Wl,--build-id" /> 
-      <linkerarg value="-Wl,--warn-shared-textrel" /> 
-      <!-- linkerarg value="-Wl,- -fatal-warnings" / --> 
+      <!-- linkerarg value="-Wl,- -no-warn-shared-textrel" / unrecognized option -->  
+      <linkerarg value="-Wl,--fatal-warnings" />
+      <linkerarg value="-nostdlib" />
+      <linkerarg value="-nostdlib++" />
       <!-- from sdk cmake end -->
 
       <linkerarg value="-fno-use-linker-plugin" /> 
 
+      <linkerarg value="-target" />
+      <linkerarg value="${env.ANDROID_LLVM_TRIPLE}" /> <!-- aarch64-none-linux-android -->
       <!-- linkerarg value="-mabi=lp64" />
       <linkerarg value="-mlittle-endian" />
       <linkerarg value="-march=armv8-a" / -->
       <!-- linkerarg value="-mfloat-abi=softfp" / -->
 
-      <linkerarg value="-nostdlib" />
       <linkerarg value="-Bdynamic" />
       <linkerarg value="-Wl,-dynamic-linker,/system/bin/linker" />
       <linkerarg value="-Wl,-z,nocopyreloc" />
 
-      <linkerarg value="--demangle" /> 
-      <linkerarg value="--gc-sections" /> 
-      <linkerarg value="--no-undefined" /> 
-      <linkerarg value="-static-libgcc" if="isGCC"/>
-      <linkerarg value="-static-libstdc++" if="isGCC"/>
+      <linkerarg value="--no-undefined" />
 
       <!-- libset libs="c,m,dl,log" / -->
       <libset libs="c,m,dl" />
@@ -136,16 +128,16 @@
   <property name="linker.cfg.id.base"            value="linker.cfg.android" /> 
   <property name="java.includes.dir.platform"    value="${java.includes.dir}/x11" />
   <available property="java.lib.dir.platform"    value="${java.home.dir}/jre/lib/i386" 
-                                                  file="${java.home.dir}/jre/lib/i386/libjava.so"/>
+                                                 file="${java.home.dir}/jre/lib/i386/libjava.so"/>
   <available property="java.lib.dir.platform"    value="${java.home.dir}/lib/i386"     
-                                                  file="${java.home.dir}/lib/i386/libjava.so"/>
+                                                 file="${java.home.dir}/lib/i386/libjava.so"/>
   <property name="java.lib.dir.platform"         value="${java.home.dir}/lib"/> <!-- new default -->
 </target>
 
 <target name="declare.linux.android">
-      <echo message="android.arm" />
-      <property name="compiler.cfg.id"                      value="compiler.cfg.android" />
-      <property name="linker.cfg.id"                        value="linker.cfg.android" />
+  <echo message="android.${env.ANDROID_ABI}" />
+  <property name="compiler.cfg.id"               value="compiler.cfg.android" />
+  <property name="linker.cfg.id"                 value="linker.cfg.android" />
 </target>
 
 </project>