summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBertrand SIMONNET <bsimonnet@google.com>2015-09-03 09:47:22 -0700
committerBertrand SIMONNET <bsimonnet@google.com>2015-09-08 09:26:18 -0700
commit0a1d7af5834f6b070b14f11ffb134634e017a657 (patch)
treee0ba26509a117562a2afbbed1f7a02f23505d725
parent7ad94707263e98d6f53b20cf590ee46ac3edefcc (diff)
downloadlibchromeos-0a1d7af5834f6b070b14f11ffb134634e017a657.tar.gz
libchromeos: Set CPPFLAGS correctly.
Change-Id: I6ab9170b8f1e434fc5c21fb1850ee9a8165ae8ea
-rw-r--r--Android.mk10
1 files changed, 5 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk
index cec4ead..14d3638 100644
--- a/Android.mk
+++ b/Android.mk
@@ -181,7 +181,7 @@ LOCAL_C_INCLUDES := $(libchromeos_includes)
LOCAL_SHARED_LIBRARIES := $(libchromeos_shared_libraries) libchromeos \
libcrypto libssl
LOCAL_CFLAGS := $(libchromeos_CFLAGS)
-LOCAL_CPPFLAGS := $(libchromeos_CFLAGS)
+LOCAL_CPPFLAGS := $(libchromeos_CPPFLAGS)
LOCAL_RTTI_FLAG := -frtti
LOCAL_CLANG := true
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
@@ -197,7 +197,7 @@ LOCAL_C_INCLUDES := $(libchromeos_includes)
LOCAL_SHARED_LIBRARIES := $(libchromeos_shared_libraries) libchromeos \
libchromeos-stream libcurl
LOCAL_CFLAGS := $(libchromeos_CFLAGS)
-LOCAL_CPPFLAGS := $(libchromeos_CFLAGS)
+LOCAL_CPPFLAGS := $(libchromeos_CPPFLAGS)
LOCAL_RTTI_FLAG := -frtti
LOCAL_CLANG := true
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
@@ -228,7 +228,7 @@ LOCAL_C_INCLUDES := $(libchromeos_includes)
LOCAL_SHARED_LIBRARIES := $(libchromeos_shared_libraries)
LOCAL_STATIC_LIBRARIES := libmodpb64
LOCAL_CFLAGS := $(libchromeos_CFLAGS)
-LOCAL_CPPFLAGS := $(libchromeos_CFLAGS)
+LOCAL_CPPFLAGS := $(libchromeos_CPPFLAGS)
LOCAL_CLANG := true
LOCAL_RTTI_FLAG := -frtti
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
@@ -245,7 +245,7 @@ LOCAL_STATIC_LIBRARIES := libgtest libgmock
LOCAL_SHARED_LIBRARIES := $(libchromeos_shared_libraries) libchromeos libcurl \
libchromeos-http libchromeos-stream libcrypto
LOCAL_CFLAGS := $(libchromeos_CFLAGS)
-LOCAL_CPPFLAGS := $(libchromeos_CFLAGS) -Wno-sign-compare
+LOCAL_CPPFLAGS := $(libchromeos_CPPFLAGS) -Wno-sign-compare
LOCAL_CLANG := true
LOCAL_RTTI_FLAG := -frtti
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
@@ -281,7 +281,7 @@ LOCAL_STATIC_LIBRARIES := libgtest libchrome_test_helpers \
LOCAL_SHARED_LIBRARIES := $(libchromeos_shared_libraries) libchromeos libcurl \
libchromeos-http libchromeos-stream libcrypto
LOCAL_CFLAGS := $(libchromeos_CFLAGS)
-LOCAL_CPPFLAGS := $(libchromeos_CFLAGS) -Wno-sign-compare
+LOCAL_CPPFLAGS := $(libchromeos_CPPFLAGS) -Wno-sign-compare
LOCAL_CLANG := true
include $(BUILD_NATIVE_TEST)