+ rename them to not clash with non intended environment variables
Signed-off-by: Petr Vorel <[email protected]>
---
examples/android-build | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/examples/android-build b/examples/android-build
index 123ba96..a420c2c 100755
--- a/examples/android-build
+++ b/examples/android-build
@@ -8,24 +8,24 @@
# the android libc must be patched around) and Gingerbread.
# Point this to the Android root directory; it's used in the defconfig CFLAGS
-export A="$HOME/android"
+export ANDROID="${ANDROID:-$HOME/android}"
# Android product being built
-P=zoom2
+TARGET_PRODUCT=${TARGET_PRODUCT:-zoom2}
# Toolchain version in use by this version of Android
GCCVER=4.4.3
-export PATH="$A/prebuilt/linux-x86/toolchain/arm-eabi-$GCCVER/bin:$PATH"
+export PATH="$ANDROID/prebuilt/linux-x86/toolchain/arm-eabi-$GCCVER/bin:$PATH"
# Set the linker flags; compiler flags are in the defconfig file
if grep "^CONFIG_STATIC=y" .config >/dev/null ; then
# Static linking
- LDFLAGS="-static -Xlinker -z -Xlinker muldefs -nostdlib
$A/out/target/product/$P/obj/lib/crtbegin_static.o
$A/out/target/product/$P/obj/lib/crtend_android.o
-L$A/out/target/product/$P/obj/lib
-L$A/out/target/product/$P/obj/STATIC_LIBRARIES/libm_intermediates
-L$A/out/target/product/$P/obj/STATIC_LIBRARIES/libc_intermediates"
+ LDFLAGS="-static -Xlinker -z -Xlinker muldefs -nostdlib
$ANDROID/out/target/product/$TARGET_PRODUCT/obj/lib/crtbegin_static.o
$ANDROID/out/target/product/$TARGET_PRODUCT/obj/lib/crtend_android.o
-L$ANDROID/out/target/product/$TARGET_PRODUCT/obj/lib
-L$ANDROID/out/target/product/$TARGET_PRODUCT/obj/STATIC_LIBRARIES/libm_intermediates
-L$ANDROID/out/target/product/$TARGET_PRODUCT/obj/STATIC_LIBRARIES/libc_intermediates"
LDLIBS="m c gcc"
else
# Dynamic linking
- LDFLAGS="-Xlinker -z -Xlinker muldefs -nostdlib -Bdynamic -Xlinker
-T$A/build/core/armelf.x -Xlinker -dynamic-linker -Xlinker /system/bin/linker
-Xlinker -z -Xlinker nocopyreloc -Xlinker --no-undefined
$A/out/target/product/$P/obj/lib/crtbegin_dynamic.o
$A/out/target/product/$P/obj/lib/crtend_android.o
-L$A/out/target/product/$P/obj/lib"
+ LDFLAGS="-Xlinker -z -Xlinker muldefs -nostdlib -Bdynamic -Xlinker
-T$ANDROID/build/core/armelf.x -Xlinker -dynamic-linker -Xlinker
/system/bin/linker -Xlinker -z -Xlinker nocopyreloc -Xlinker --no-undefined
$ANDROID/out/target/product/$TARGET_PRODUCT/obj/lib/crtbegin_dynamic.o
$ANDROID/out/target/product/$TARGET_PRODUCT/obj/lib/crtend_android.o
-L$ANDROID/out/target/product/$TARGET_PRODUCT/obj/lib"
LDLIBS="dl m c gcc"
fi
--
2.9.3
_______________________________________________
busybox mailing list
[email protected]
http://lists.busybox.net/mailman/listinfo/busybox
