Remove references to 'cupcake' in all of NDK (replace with 'android-1.5')
This commit is contained in:
@@ -166,7 +166,7 @@ rm -rf $LIB_ROOT
|
|||||||
mkdir -p $LIB_ROOT
|
mkdir -p $LIB_ROOT
|
||||||
cp -f $CRT_OBJS $STATIC_LIBS $DYNAMIC_LIBS $LIB_ROOT
|
cp -f $CRT_OBJS $STATIC_LIBS $DYNAMIC_LIBS $LIB_ROOT
|
||||||
|
|
||||||
# Check $TOP/bionic to see if this is new layout in cupcake.
|
# Check $TOP/bionic to see if this is new source layout.
|
||||||
if [ -d $TOP/bionic ] ;then
|
if [ -d $TOP/bionic ] ;then
|
||||||
BIONIC_ROOT=$TOP/bionic
|
BIONIC_ROOT=$TOP/bionic
|
||||||
LIBC_ROOT=$BIONIC_ROOT/libc
|
LIBC_ROOT=$BIONIC_ROOT/libc
|
||||||
|
|||||||
@@ -201,7 +201,7 @@ TARGET_ARCH
|
|||||||
|
|
||||||
TARGET_PLATFORM
|
TARGET_PLATFORM
|
||||||
Name of the target Android platform when this Android.mk is parsed.
|
Name of the target Android platform when this Android.mk is parsed.
|
||||||
For now, only 'cupcake' is supported.
|
For now, only 'android-1.5' is supported.
|
||||||
|
|
||||||
TARGET_ARCH_ABI
|
TARGET_ARCH_ABI
|
||||||
Name of the target CPU+ABI when this Android.mk is parsed.
|
Name of the target CPU+ABI when this Android.mk is parsed.
|
||||||
@@ -219,7 +219,7 @@ TARGET_ABI
|
|||||||
as $(TARGET_PLATFORM)-$(TARGET_ARCH_ABI) and is useful when you want
|
as $(TARGET_PLATFORM)-$(TARGET_ARCH_ABI) and is useful when you want
|
||||||
to test against a specific target system image for a real device.
|
to test against a specific target system image for a real device.
|
||||||
|
|
||||||
By default, this will be 'cupcake-arm'
|
By default, this will be 'android-1.5-arm'
|
||||||
|
|
||||||
|
|
||||||
NDK-provided function macros:
|
NDK-provided function macros:
|
||||||
|
|||||||
Reference in New Issue
Block a user