From b20725d4a08e5d1dbb51c0bf07bc77321d33a8e7 Mon Sep 17 00:00:00 2001
From: David 'Digit' Turner <digit@google.com>
Date: Mon, 11 May 2009 16:37:42 +0200
Subject: [PATCH] Remove references to 'cupcake' in all of NDK (replace with
 'android-1.5')

---
 ndk/build/tools/build-ndk-sysroot.sh | 2 +-
 ndk/docs/ANDROID-MK.TXT              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ndk/build/tools/build-ndk-sysroot.sh b/ndk/build/tools/build-ndk-sysroot.sh
index bc39f8e64..54ce1135e 100755
--- a/ndk/build/tools/build-ndk-sysroot.sh
+++ b/ndk/build/tools/build-ndk-sysroot.sh
@@ -166,7 +166,7 @@ rm -rf $LIB_ROOT
 mkdir -p $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
   BIONIC_ROOT=$TOP/bionic
   LIBC_ROOT=$BIONIC_ROOT/libc
diff --git a/ndk/docs/ANDROID-MK.TXT b/ndk/docs/ANDROID-MK.TXT
index 4b7574e0d..be517e1d6 100644
--- a/ndk/docs/ANDROID-MK.TXT
+++ b/ndk/docs/ANDROID-MK.TXT
@@ -201,7 +201,7 @@ TARGET_ARCH
 
 TARGET_PLATFORM
     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
     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
     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: