Merge change 8501 into donut
* changes:
Handle LOCAL_CPPFLAGS/CFLAGS/CXXFLAGS as claimed by the documentation.
diff --git a/ndk/build/core/definitions.mk b/ndk/build/core/definitions.mk
index b5079e2..2272542 100644
--- a/ndk/build/core/definitions.mk
+++ b/ndk/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 @@
$$($$(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 @@
$$($$(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/ndk/docs/CHANGES.TXT b/ndk/docs/CHANGES.TXT
index b2804d8..56990fc 100644
--- a/ndk/docs/CHANGES.TXT
+++ b/ndk/docs/CHANGES.TXT
@@ -33,5 +33,11 @@
- 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.