commit 17053907be296edeec6e113da6f9f80a60827479
author Nowar Gu <nowar100@gmail.com> Mon Jul 04 14:23:03 2011 +0800
committer Nowar Gu <nowar100@gmail.com> Mon Jul 04 14:24:02 2011 +0800
tree eac2b505b7db9edebb7be7462a282ca7cdc88f82
parent d199f700ce7ff4c91a423fcacdaa55a6ca99bf26

-DANDROID is deprecated.

We should use -D__ANDROID__.

build/core/build-binary.mk

diff --git a/build/core/build-binary.mk b/build/core/build-binary.mk
index 4f001ad..0d805db 100644
--- a/build/core/build-binary.mk
+++ b/build/core/build-binary.mk
@@ -57,8 +57,8 @@
 LOCAL_OBJECTS :=
 
 # always define ANDROID when building binaries
-#
-LOCAL_CFLAGS := -DANDROID $(LOCAL_CFLAGS)
+# -DANDROID is deprecated.
+LOCAL_CFLAGS := -D__ANDROID__ -DANDROID $(LOCAL_CFLAGS)
 
 #
 # Add the default system shared libraries to the build
@@ -277,6 +277,7 @@
 	@ echo "Bitcode        : $(PRIVATE_NAME)"
 	$(hide) rm -rf $@
 	$(hide) $(cmd-build-bitcode)
+
 ALL_BITCODE += $(LOCAL_BUILT_MODULE)
 endif
 
@@ -335,6 +336,7 @@
 $(LOCAL_INSTALLED): PRIVATE_SRC     := $(LOCAL_BUILT_MODULE)
 
 ifeq ($(call module-get-class,$(LOCAL_MODULE)),BITCODE)
+# FIXME(Nowar): What bug? Please write it down.
 # BUG FIXME
 $(LOCAL_INSTALLED): PRIVATE_INSTALLED := res/raw/$(PRIVATE_NAME)
 $(LOCAL_INSTALLED): PRIVATE_DST_DIR :=  res/raw