diff options
| author | Stephen Hines <srhines@google.com> | 2011-12-06 18:43:24 -0800 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2011-12-07 11:41:28 -0800 |
| commit | 914f7a2990ef0e02d4632dd77076c6c7bb11e6dd (patch) | |
| tree | 2a9d3ffe6913191fcbcae9f3b6317c0408d47332 /core | |
| parent | bfcdc63c22ae6dd1aa909f7696693d539da3f4aa (diff) | |
| download | build-914f7a2990ef0e02d4632dd77076c6c7bb11e6dd.zip build-914f7a2990ef0e02d4632dd77076c6c7bb11e6dd.tar.gz build-914f7a2990ef0e02d4632dd77076c6c7bb11e6dd.tar.bz2 | |
Enable -Wall/-Werror with LOCAL_RENDERSCRIPT_FLAGS.
Change-Id: Ia2a058e6711839d89072c2e96f0c60aa4cedda6b
Diffstat (limited to 'core')
| -rw-r--r-- | core/clear_vars.mk | 1 | ||||
| -rw-r--r-- | core/definitions.mk | 1 | ||||
| -rw-r--r-- | core/java.mk | 6 |
3 files changed, 8 insertions, 0 deletions
diff --git a/core/clear_vars.mk b/core/clear_vars.mk index d9f3372..3a04b7b 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -107,6 +107,7 @@ LOCAL_MANIFEST_FILE:= LOCAL_RENDERSCRIPT_INCLUDES:= LOCAL_RENDERSCRIPT_INCLUDES_OVERRIDE:= LOCAL_RENDERSCRIPT_CC:= +LOCAL_RENDERSCRIPT_FLAGS:= LOCAL_RENDERSCRIPT_TARGET_API:= LOCAL_BUILD_HOST_DEX:= LOCAL_DEX_PREOPT:= # '',true,false,nostripping diff --git a/core/definitions.mk b/core/definitions.mk index 53f22c7..154c026 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -802,6 +802,7 @@ $(hide) $(PRIVATE_RS_CC) \ -d $(PRIVATE_RS_OUTPUT_DIR) \ -a $@ -MD \ $(addprefix -target-api , $(PRIVATE_RS_TARGET_API)) \ + $(PRIVATE_RS_FLAGS) \ $(foreach inc,$(PRIVATE_RS_INCLUDES),$(addprefix -I , $(inc))) \ $(PRIVATE_RS_SOURCE_FILES) #$(hide) $(LLVM_RS_LINK) \ diff --git a/core/java.mk b/core/java.mk index 1cde62b..0cc0762 100644 --- a/core/java.mk +++ b/core/java.mk @@ -152,6 +152,11 @@ ifeq ($(LOCAL_RENDERSCRIPT_CC),) LOCAL_RENDERSCRIPT_CC := $(LLVM_RS_CC) endif +# Turn on all warnings and warnings as errors for RS compiles. +# This can be disabled with LOCAL_RENDERSCRIPT_FLAGS := -Wno-error +renderscript_flags := -Wall -Werror +renderscript_flags += $(LOCAL_RENDERSCRIPT_FLAGS) + # prepend the RenderScript system include path ifneq ($(filter-out current,$(LOCAL_SDK_VERSION)),) LOCAL_RENDERSCRIPT_INCLUDES := \ @@ -171,6 +176,7 @@ endif $(RenderScript_file_stamp): PRIVATE_RS_INCLUDES := $(LOCAL_RENDERSCRIPT_INCLUDES) $(RenderScript_file_stamp): PRIVATE_RS_CC := $(LOCAL_RENDERSCRIPT_CC) +$(RenderScript_file_stamp): PRIVATE_RS_FLAGS := $(renderscript_flags) $(RenderScript_file_stamp): PRIVATE_RS_SOURCE_FILES := $(renderscript_sources_fullpath) # By putting the generated java files into $(LOCAL_INTERMEDIATE_SOURCE_DIR), they will be # automatically found by the java compiling function transform-java-to-classes.jar. |