Fixes for building

- Need GDB8.0 milestone
- Make uClibc "master" package
- Rename bionic -> android-ndk to match the package name and
  support suffixes for archives

Signed-off-by: Alexey Neyman <stilor@att.net>

2 files changed, 6 insertions, 7 deletions

diff --git a/scripts/build/libc/bionic.sh b/scripts/build/libc/bionic.sh
index a52078d..027493d 100644
--- a/scripts/build/libc/bionic.sh
+++ b/scripts/build/libc/bionic.sh
@@ -3,17 +3,17 @@
 # Licensed under the GPL v2. See COPYING in the root of this package
 
 do_libc_get() {
-    CT_Fetch BIONIC
+    CT_Fetch ANDROID_NDK
 }
 
 do_libc_extract() {
-    CT_ExtractPatch BIONIC
+    CT_ExtractPatch ANDROID_NDK
 }
 
 # Install Unified headers
 do_libc_start_files() {
     CT_DoStep INFO "Installing C library headers"
-    CT_DoExecLog ALL cp -r "${CT_SRC_DIR}/bionic/sysroot/usr" "${CT_SYSROOT_DIR}"
+    CT_DoExecLog ALL cp -r "${CT_SRC_DIR}/android-ndk/sysroot/usr" "${CT_SYSROOT_DIR}"
 }
 
 do_libc() {
@@ -25,7 +25,7 @@ do_libc() {
         arch="${arch}64"
     fi
     CT_DoStep INFO "Installing C library binaries"
-    CT_DoExecLog ALL cp -r "${CT_SRC_DIR}/bionic/platforms/android-${CT_ANDROID_API}/arch-${arch}/usr" "${CT_SYSROOT_DIR}"
+    CT_DoExecLog ALL cp -r "${CT_SRC_DIR}/android-ndk/platforms/android-${CT_ANDROID_API}/arch-${arch}/usr" "${CT_SYSROOT_DIR}"
     CT_EnvModify CT_TARGET_CFLAGS "${CT_TARGET_CFLAGS} -D__ANDROID_API__=${CT_ANDROID_API}"
 }
 
diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh
index e428349..1e6db21 100644
--- a/scripts/build/libc/uClibc.sh
+++ b/scripts/build/libc/uClibc.sh
@@ -7,16 +7,15 @@
 uclibc_locales_version=030818
 uclibc_locale_tarball="uClibc-locale-${uclibc_locales_version}"
 
-if [ "${CT_UCLIBC_NG_USE_UCLIBC_NG_ORG}" = "y" ]; then
+if [ "${CT_UCLIBC_USE_UCLIBC_NG_ORG}" = "y" ]; then
     # TBD make the name come from config/versions/uclibc.in
     uclibc_name="uClibc-ng"
-elif [ "${CT_UCLIBC_NG_USE_UCLIBC_ORG}" = "y" ]; then
+elif [ "${CT_UCLIBC_USE_UCLIBC_ORG}" = "y" ]; then
     uclibc_name="uClibc"
 fi
 
 # Download uClibc
 do_libc_get() {
-    # TBD allow for "default fork" selection in package.desc and select uClibc-NG (and then use just UCLIBC moniker)
     CT_Fetch UCLIBC_NG
     # TBD locales
 }