diff options
author | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2013-07-28 00:41:45 +0200 |
---|---|---|
committer | Ubuntu <vishal.bhoj@linaro.org> | 2014-06-05 09:53:47 +0000 |
commit | edb8dea2e13ecb5818ec6a82fa1f53d0ae3b7f4e (patch) | |
tree | a6a24c4a95c2bca9100aa5cdcdaac34985976d8c | |
parent | 7be2ef22cc39cf0d7e808542b60a80d975b36f9e (diff) | |
download | rs-linaro_android_4.4.3.tar.gz |
rs: Fix RS_VERSION definelinaro_android_4.4.4linaro_android_4.4.3
Commit 51dc7a27a8749d4ad43169bf39d4378529e132cd broke the RS_VERSION
define by setting LOCAL_CFLAGS := something after the addition of
LOCAL_CFLAGS += -DRS_VERSION=...
Make sure the := definition occurs before the += amendment.
Change-Id: I320ae9215f3ef2982c707a6ecaf5a14880ffa036
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
-rw-r--r-- | cpp/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/Android.mk b/cpp/Android.mk index 9b3f6f3f..b7c38b20 100644 --- a/cpp/Android.mk +++ b/cpp/Android.mk @@ -23,6 +23,8 @@ endif local_cflags_for_rs_cpp += -DRS_VERSION=$(RS_VERSION) LOCAL_SRC_FILES := $(rs_cpp_SRC_FILES) +LOCAL_CFLAGS := $(call-cc-cpp-option,-Qunused-arguments) +LOCAL_CFLAGS += $(local_cflags_for_rs_cpp) LOCAL_CFLAGS += $(local_cflags_for_rs_cpp) @@ -38,8 +40,6 @@ LOCAL_MODULE:= libRScpp LOCAL_MODULE_TAGS := optional -LOCAL_CFLAGS := $(call-cc-cpp-option,-Qunused-arguments) - intermediates := $(call intermediates-dir-for,STATIC_LIBRARIES,libRS,TARGET,) librs_generated_headers := \ $(intermediates)/rsgApiStructs.h \ |