Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2972716 authored by Stephen Hines's avatar Stephen Hines Committed by Android (Google) Code Review
Browse files

Merge "Enable -Wall/-Werror with LOCAL_RENDERSCRIPT_FLAGS."

parents b0f29e00 914f7a29

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -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

core/definitions.mk

+1 −0
Original line number Diff line number Diff line
@@ -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) \

core/java.mk

+6 −0
Original line number Diff line number Diff line
@@ -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.