Merge pull request #1117 from stilor/fix-android

Fix android sample

scripts/build/libc.sh

@@ -4,8 +4,8 @@
 
 # Define default hooks - download/unpack just the main package; no-op build hooks.
 # The actual implementation can override just what it needs then.
-eval "${CT_LIBC//[^A-Za-z0-9]/_}_get() { CT_Fetch ${CT_LIBC_CHOICE_KSYM}; }"
-eval "${CT_LIBC//[^A-Za-z0-9]/_}_extract() { CT_ExtractPatch ${CT_LIBC_CHOICE_KSYM}; }"
+eval "${CT_LIBC//[^A-Za-z0-9]/_}_get() { CT_Fetch \"\${CT_LIBC_${CT_LIBC_CHOICE_KSYM}_PKG_KSYM}\"; }"
+eval "${CT_LIBC//[^A-Za-z0-9]/_}_extract() { CT_ExtractPatch \"\${CT_LIBC_${CT_LIBC_CHOICE_KSYM}_PKG_KSYM}\"; }"
 for _m in start_files main post_cc; do
     eval "${CT_LIBC//[^A-Za-z0-9]/_}_${_m}() { :; }"
 done

scripts/build/libc/bionic.sh

@@ -21,10 +21,14 @@ bionic_main()
     CT_DoStep INFO "Installing C library binaries"
     CT_DoExecLog ALL cp -r "${CT_SRC_DIR}/android-ndk/platforms/android-${CT_ANDROID_API}/arch-${arch}/usr" "${CT_SYSROOT_DIR}"
 
-    # NB: Modifying CT_TARGET_CFLAGS here, not CT_ALL_TARGET_CFLAGS: the __ANDROID_API__
+    # NB: Modifying both CT_TARGET_CFLAGS and CT_ALL_TARGET_CFLAGS: the __ANDROID_API__
     # definition needs to be passed into GCC build, or the resulting libstdc++ gets
     # miscompiled (attempt to link against it results in unresolved symbols to stdout/...).
     # And since __ANDROID_API__ is a user config option, placing it with other user-supplied
     # options isn't completely out of character.
+    # On the other hand, CT_ALL_TARGET_CFLAGS in non-multilib builds is already set and does
+    # not get recalculated after GCC build, so setting CT_TARGET_CFLAGS is not reflected
+    # on other libraries/apps, such as gdbserver.
     CT_EnvModify CT_TARGET_CFLAGS "${CT_TARGET_CFLAGS} -D__ANDROID_API__=${CT_ANDROID_API}"
+    CT_EnvModify CT_ALL_TARGET_CFLAGS "${CT_ALL_TARGET_CFLAGS} -D__ANDROID_API__=${CT_ANDROID_API}"
 }