* commit '3487736bac5625bef8ff9bc4ef311b29348055d9': Support custom RenderScript compiler
This commit is contained in:
@@ -102,6 +102,7 @@ LOCAL_EMMA_COVERAGE_FILTER:=
|
|||||||
LOCAL_WARNINGS_ENABLE:=
|
LOCAL_WARNINGS_ENABLE:=
|
||||||
LOCAL_MANIFEST_FILE:=
|
LOCAL_MANIFEST_FILE:=
|
||||||
LOCAL_RENDERSCRIPT_INCLUDES:=
|
LOCAL_RENDERSCRIPT_INCLUDES:=
|
||||||
|
LOCAL_RENDERSCRIPT_CC:=
|
||||||
LOCAL_BUILD_HOST_DEX:=
|
LOCAL_BUILD_HOST_DEX:=
|
||||||
LOCAL_DEX_PREOPT:=
|
LOCAL_DEX_PREOPT:=
|
||||||
LOCAL_PROTOC_OPTIMIZE_TYPE:= # lite(default),micro,full
|
LOCAL_PROTOC_OPTIMIZE_TYPE:= # lite(default),micro,full
|
||||||
|
@@ -781,7 +781,7 @@ define transform-renderscripts-to-java-and-bc
|
|||||||
$(hide) rm -rf $(PRIVATE_RS_OUTPUT_DIR)
|
$(hide) rm -rf $(PRIVATE_RS_OUTPUT_DIR)
|
||||||
$(hide) mkdir -p $(PRIVATE_RS_OUTPUT_DIR)/res/raw
|
$(hide) mkdir -p $(PRIVATE_RS_OUTPUT_DIR)/res/raw
|
||||||
$(hide) mkdir -p $(PRIVATE_RS_OUTPUT_DIR)/src
|
$(hide) mkdir -p $(PRIVATE_RS_OUTPUT_DIR)/src
|
||||||
$(hide) $(LLVM_RS_CC) \
|
$(hide) $(PRIVATE_RS_CC) \
|
||||||
-o $(PRIVATE_RS_OUTPUT_DIR)/res/raw \
|
-o $(PRIVATE_RS_OUTPUT_DIR)/res/raw \
|
||||||
-p $(PRIVATE_RS_OUTPUT_DIR)/src \
|
-p $(PRIVATE_RS_OUTPUT_DIR)/src \
|
||||||
-d $(PRIVATE_RS_OUTPUT_DIR) \
|
-d $(PRIVATE_RS_OUTPUT_DIR) \
|
||||||
|
@@ -148,12 +148,17 @@ LOCAL_RENDERSCRIPT_INCLUDES := \
|
|||||||
$(LOCAL_RENDERSCRIPT_INCLUDES)
|
$(LOCAL_RENDERSCRIPT_INCLUDES)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(LOCAL_RENDERSCRIPT_CC),)
|
||||||
|
LOCAL_RENDERSCRIPT_CC := $(LLVM_RS_CC)
|
||||||
|
endif
|
||||||
|
|
||||||
$(RenderScript_file_stamp): PRIVATE_RS_INCLUDES := $(LOCAL_RENDERSCRIPT_INCLUDES)
|
$(RenderScript_file_stamp): PRIVATE_RS_INCLUDES := $(LOCAL_RENDERSCRIPT_INCLUDES)
|
||||||
|
$(RenderScript_file_stamp): PRIVATE_RS_CC := $(LOCAL_RENDERSCRIPT_CC)
|
||||||
$(RenderScript_file_stamp): PRIVATE_RS_SOURCE_FILES := $(renderscript_sources_fullpath)
|
$(RenderScript_file_stamp): PRIVATE_RS_SOURCE_FILES := $(renderscript_sources_fullpath)
|
||||||
# By putting the generated java files into $(LOCAL_INTERMEDIATE_SOURCE_DIR), they will be
|
# 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.
|
# automatically found by the java compiling function transform-java-to-classes.jar.
|
||||||
$(RenderScript_file_stamp): PRIVATE_RS_OUTPUT_DIR := $(renderscript_intermediate)
|
$(RenderScript_file_stamp): PRIVATE_RS_OUTPUT_DIR := $(renderscript_intermediate)
|
||||||
$(RenderScript_file_stamp): $(renderscript_sources_fullpath) $(LLVM_RS_CC)
|
$(RenderScript_file_stamp): $(renderscript_sources_fullpath) $(LOCAL_RENDERSCRIPT_CC)
|
||||||
$(transform-renderscripts-to-java-and-bc)
|
$(transform-renderscripts-to-java-and-bc)
|
||||||
|
|
||||||
# include the dependency files (.d) generated by llvm-rs-cc.
|
# include the dependency files (.d) generated by llvm-rs-cc.
|
||||||
|
Reference in New Issue
Block a user