From 2ab9c51a581188f1986d9ab578c513665a84460a Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Fri, 24 Jul 2009 17:42:21 +0200 Subject: [PATCH] Handle LOCAL_CPPFLAGS/CFLAGS/CXXFLAGS as claimed by the documentation. The previous code did only use LOCAL_CFLAGS for both C and C++ sources. --- build/core/definitions.mk | 6 ++++-- docs/CHANGES.TXT | 6 ++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/build/core/definitions.mk b/build/core/definitions.mk index b5079e2..2272542 100644 --- a/build/core/definitions.mk +++ b/build/core/definitions.mk @@ -16,7 +16,7 @@ # # We use the GNU Make Standard Library -include build/gmsl/gmsl +include $(BUILD_SYSTEM)/../gmsl/gmsl # This is the Android NDK version number as a list of three items: # major, minor, revision @@ -371,6 +371,7 @@ $$(_OBJ): PRIVATE_CFLAGS := $$($$(my)CFLAGS) \ $$($$(my)$(LOCAL_ARM_MODE)_$(LOCAL_BUILD_MODE)_CFLAGS) \ $$(LOCAL_C_INCLUDES:%=-I%) \ -I$$(LOCAL_PATH) \ + $$(LOCAL_CPPFLAGS) \ $$(LOCAL_CFLAGS) \ $$(NDK_APP_CPPFLAGS) \ $$(NDK_APP_CFLAGS) @@ -430,7 +431,8 @@ $$(_OBJ): PRIVATE_CXXFLAGS := $$($$(my)CXXFLAGS) \ $$($$(my)$(LOCAL_ARM_MODE)_$(LOCAL_BUILD_MODE)_CFLAGS) \ $$(LOCAL_C_INCLUDES:%=-I%) \ -I$$(LOCAL_PATH) \ - $$(LOCAL_CFLAGS) \ + $$(LOCAL_CPPFLAGS) \ + $$(LOCAL_CXXFLAGS) \ $$(NDK_APP_CPPFLAGS) \ $$(NDK_APP_CXXFLAGS) \ diff --git a/docs/CHANGES.TXT b/docs/CHANGES.TXT index b2804d8..56990fc 100644 --- a/docs/CHANGES.TXT +++ b/docs/CHANGES.TXT @@ -33,5 +33,11 @@ current version - Fix compilation of assembler files (e.g. foo.S) +- Make LOCAL_CFLAGS / LOCAL_CXXFLAGS / LOCAL_CPPFLAGS work as advertized + by the documentation (previously, only LOCAL_CFLAGS did work for both C + *and* C++ sources, contrary to what the doc claimed). + + Note that APP_CPPFLAGS / APP_CFLAGS / APP_CXXFLAGS continue to work. + ------------------------------------------------------------------------------- android-1.5_r1 released. -- 2.11.0