Fix LOCAL_CFLAGS/CPPFLAGS handling to match full Android build system.

[android-x86/development.git] / ndk / docs / APPLICATION-MK.TXT

diff --git a/ndk/docs/APPLICATION-MK.TXT b/ndk/docs/APPLICATION-MK.TXT
index 6f84da9..7016c4d 100644 (file)
--- a/ndk/docs/APPLICATION-MK.TXT
+++ b/ndk/docs/APPLICATION-MK.TXT
@@ -62,7 +62,7 @@ APP_OPTIM
     the code difficult, stack traces may not be reliable, etc...
 
 APP_CFLAGS
-    A set of C compiler flags passed when compiling any C source code
+    A set of C compiler flags passed when compiling any C or C++ source code
     of any of the modules. This can be used to change the build of a given
     module depending on the application that needs it, instead of modifying
     the Android.mk file itself.
@@ -89,11 +89,20 @@ APP_CFLAGS
     +
     +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
+    NOTE: In android-ndk-1.5_r1, this only applied to C sources, not C++ ones.
+          This has been corrected to match the full Android build system.
+
 APP_CXXFLAGS
-    Same as APP_CFLAGS for C++ sources.
+    An alias for APP_CPPFLAGS, to be considered obsolete as it may disappear
+    in a future release of the NDK.
 
 APP_CPPFLAGS
-    Same as APP_CFLAGS but will be passed to both C and C++ sources
+    A set of C++ compiler flags passed when building C++ sources *only*.
+
+    NOTE: In android-ndk-1.5_r1, this applied to both C and C++ sources.
+          This has been corrected to match the full Android build system.
+          You can now use APP_CFLAGS for flags that shall apply to C and
+          C++ souces.
 
 A trivial Application.mk file would be: