summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--parameter/Android.mk6
-rw-r--r--remote-process/Android.mk6
-rw-r--r--remote-processor/Android.mk6
-rw-r--r--test/test-platform/Android.mk6
-rw-r--r--xmlserializer/Android.mk6
5 files changed, 15 insertions, 15 deletions
diff --git a/parameter/Android.mk b/parameter/Android.mk
index 6433829..ebbf5e2 100644
--- a/parameter/Android.mk
+++ b/parameter/Android.mk
@@ -100,7 +100,7 @@ COMMON_SRC_FILES := \
COMMON_MODULE := libparameter
COMMON_MODULE_TAGS := optional
-COMMON_ERROR_FLAGS := -Wno-non-virtual-dtor
+COMMON_CFLAGS := -Wno-non-virtual-dtor
COMMON_C_INCLUDES := \
$(LOCAL_PATH)/../utility/ \
@@ -125,7 +125,7 @@ LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
LOCAL_MODULE := $(COMMON_MODULE)
LOCAL_MODULE_TAGS := $(COMMON_MODULE_TAGS)
-TARGET_ERROR_FLAGS += $(COMMON_ERROR_FLAGS)
+LOCAL_CFLAGS += $(COMMON_CFLAGS)
LOCAL_C_INCLUDES += \
$(COMMON_C_INCLUDES) \
@@ -150,7 +150,7 @@ LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
LOCAL_MODULE := $(COMMON_MODULE)
LOCAL_MODULE_TAGS := $(COMMON_MODULE_TAGS)
-TARGET_ERROR_FLAGS += $(COMMON_ERROR_FLAGS)
+LOCAL_CFLAGS += $(COMMON_CFLAGS)
LOCAL_C_INCLUDES += \
$(COMMON_C_INCLUDES)
diff --git a/remote-process/Android.mk b/remote-process/Android.mk
index eeef63c..dbdf6b5 100644
--- a/remote-process/Android.mk
+++ b/remote-process/Android.mk
@@ -9,7 +9,7 @@ COMMON_SRC_FILES := \
COMMON_MODULE := remote-process
COMMON_MODULE_TAGS := optional
-COMMON_ERROR_FLAGS := -Wno-non-virtual-dtor
+COMMON_CFLAGS := -Wno-non-virtual-dtor
COMMON_C_INCLUDES := \
$(LOCAL_PATH)/../remote-processor/
@@ -26,7 +26,7 @@ LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
LOCAL_MODULE := $(COMMON_MODULE)
LOCAL_MODULE_TAGS := $(COMMON_MODULE_TAGS)
-TARGET_ERROR_FLAGS += $(COMMON_ERROR_FLAGS)
+LOCAL_CFLAGS += $(COMMON_CFLAGS)
LOCAL_C_INCLUDES += \
$(COMMON_C_INCLUDES) \
@@ -48,7 +48,7 @@ LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
LOCAL_MODULE := $(COMMON_MODULE)_host
LOCAL_MODULE_TAGS := $(COMMON_MODULE_TAGS)
-TARGET_ERROR_FLAGS += $(COMMON_ERROR_FLAGS)
+LOCAL_CFLAGS += $(COMMON_CFLAGS)
LOCAL_C_INCLUDES += \
$(COMMON_C_INCLUDES)
diff --git a/remote-processor/Android.mk b/remote-processor/Android.mk
index 3f8173c..7da064a 100644
--- a/remote-processor/Android.mk
+++ b/remote-processor/Android.mk
@@ -16,7 +16,7 @@ COMMON_SRC_FILES := \
COMMON_MODULE := libremote-processor
COMMON_MODULE_TAGS := optional
-COMMON_ERROR_FLAGS := -Wno-non-virtual-dtor
+COMMON_CFLAGS := -Wno-non-virtual-dtor
COMMON_LDLIBS := -lpthread
@@ -30,7 +30,7 @@ LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
LOCAL_MODULE := $(COMMON_MODULE)
LOCAL_MODULE_TAGS := $(COMMON_MODULE_TAGS)
-TARGET_ERROR_FLAGS += $(COMMON_ERROR_FLAGS)
+LOCAL_CFLAGS += $(COMMON_CFLAGS)
LOCAL_C_INCLUDES += \
external/stlport/stlport/ \
@@ -52,7 +52,7 @@ LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
LOCAL_MODULE := $(COMMON_MODULE)
LOCAL_MODULE_TAGS := $(COMMON_MODULE_TAGS)
-TARGET_ERROR_FLAGS += $(COMMON_ERROR_FLAGS)
+LOCAL_CFLAGS += $(COMMON_CFLAGS)
LOCAL_LDLIBS += $(COMMON_LDLIBS)
diff --git a/test/test-platform/Android.mk b/test/test-platform/Android.mk
index f6f797e..f4e6a88 100644
--- a/test/test-platform/Android.mk
+++ b/test/test-platform/Android.mk
@@ -10,7 +10,7 @@ COMMON_SRC_FILES := \
COMMON_MODULE := test-platform
COMMON_MODULE_TAGS := optional
-COMMON_ERROR_FLAGS := -Wno-non-virtual-dtor
+COMMON_CFLAGS := -Wno-non-virtual-dtor
COMMON_C_INCLUDES := \
$(LOCAL_PATH)/../../parameter \
@@ -28,7 +28,7 @@ LOCAL_SRC_FILES:= $(COMMON_SRC_FILES)
LOCAL_MODULE:= $(COMMON_MODULE)
LOCAL_MODULE_TAGS := $(COMMON_MODULE_TAGS)
-TARGET_ERROR_FLAGS += $(COMMON_ERROR_FLAGS)
+LOCAL_CFLAGS += $(COMMON_CFLAGS)
LOCAL_C_INCLUDES += \
$(COMMON_C_INCLUDES) \
@@ -50,7 +50,7 @@ LOCAL_SRC_FILES:= $(COMMON_SRC_FILES)
LOCAL_MODULE:= $(COMMON_MODULE)
LOCAL_MODULE_TAGS := $(COMMON_MODULE_TAGS)
-TARGET_ERROR_FLAGS += $(COMMON_ERROR_FLAGS)
+LOCAL_CFLAGS += $(COMMON_CFLAGS)
LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
diff --git a/xmlserializer/Android.mk b/xmlserializer/Android.mk
index 5f54874..6d2770c 100644
--- a/xmlserializer/Android.mk
+++ b/xmlserializer/Android.mk
@@ -18,7 +18,7 @@ COMMON_MODULE := libxmlserializer
COMMON_MODULE_TAGS := optional
-COMMON_ERROR_FLAGS := -Wno-non-virtual-dtor
+COMMON_CFLAGS := -Wno-non-virtual-dtor
COMMON_C_INCLUDES := \
external/libxml2/include/ \
@@ -39,7 +39,7 @@ LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
LOCAL_MODULE := $(COMMON_MODULE)
LOCAL_MODULE_TAGS := $(COMMON_MODULE_TAGS)
-TARGET_ERROR_FLAGS += $(COMMON_ERROR_FLAGS)
+LOCAL_CFLAGS += $(COMMON_CFLAGS)
LOCAL_C_INCLUDES += \
$(COMMON_C_INCLUDES) \
@@ -63,7 +63,7 @@ LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
LOCAL_MODULE := $(COMMON_MODULE)
LOCAL_MODULE_TAGS := $(COMMON_MODULE_TAGS)
-TARGET_ERROR_FLAGS += $(COMMON_ERROR_FLAGS)
+LOCAL_CFLAGS += $(COMMON_CFLAGS)
LOCAL_C_INCLUDES += \
$(COMMON_C_INCLUDES)