diff options
| -rw-r--r-- | core/config.mk | 2 | ||||
| -rw-r--r-- | core/definitions.mk | 2 | ||||
| -rw-r--r-- | core/java.mk | 4 | ||||
| -rw-r--r-- | core/user_tags.mk | 1 |
4 files changed, 4 insertions, 5 deletions
diff --git a/core/config.mk b/core/config.mk index 51a5d9c..85cc761 100644 --- a/core/config.mk +++ b/core/config.mk @@ -221,7 +221,7 @@ E2FSCK := $(HOST_OUT_EXECUTABLES)/e2fsck$(HOST_EXECUTABLE_SUFFIX) JARJAR := $(HOST_OUT_JAVA_LIBRARIES)/jarjar.jar PROGUARD := external/proguard/bin/proguard.sh JAVATAGS := build/tools/java-event-log-tags.py -SLANG := $(HOST_OUT_EXECUTABLES)/slang$(HOST_EXECUTABLE_SUFFIX) +LLVM_RS_CC := $(HOST_OUT_EXECUTABLES)/llvm-rs-cc$(HOST_EXECUTABLE_SUFFIX) DEXOPT := $(HOST_OUT_EXECUTABLES)/dexopt$(HOST_EXECUTABLE_SUFFIX) DEXPREOPT := dalvik/tools/dex-preopt diff --git a/core/definitions.mk b/core/definitions.mk index 0c30c14..05e7c56 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -767,7 +767,7 @@ define transform-renderscripts-to-java-and-bc $(hide) rm -rf $(PRIVATE_RS_OUTPUT_DIR) $(hide) mkdir -p $(PRIVATE_RS_OUTPUT_DIR)/res/raw $(hide) mkdir -p $(PRIVATE_RS_OUTPUT_DIR)/src -$(hide) $(SLANG) \ +$(hide) $(LLVM_RS_CC) \ -o $(PRIVATE_RS_OUTPUT_DIR)/res/raw \ -p $(PRIVATE_RS_OUTPUT_DIR)/src \ -d $(PRIVATE_RS_OUTPUT_DIR) \ diff --git a/core/java.mk b/core/java.mk index 584bf7a..2120427 100644 --- a/core/java.mk +++ b/core/java.mk @@ -134,10 +134,10 @@ $(RenderScript_file_stamp): PRIVATE_RS_SOURCE_FILES := $(renderscript_sources_fu # 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. $(RenderScript_file_stamp): PRIVATE_RS_OUTPUT_DIR := $(renderscript_intermediate) -$(RenderScript_file_stamp): $(renderscript_sources_fullpath) $(SLANG) +$(RenderScript_file_stamp): $(renderscript_sources_fullpath) $(LLVM_RS_CC) $(transform-renderscripts-to-java-and-bc) -# include the dependency files (.d) generated by slang. +# include the dependency files (.d) generated by llvm-rs-cc. renderscript_generated_dep_files := $(addprefix $(renderscript_intermediate)/, \ $(patsubst %.rs,%.d, $(notdir $(renderscript_sources)))) -include $(renderscript_generated_dep_files) diff --git a/core/user_tags.mk b/core/user_tags.mk index 557f791..fbafd6c 100644 --- a/core/user_tags.mk +++ b/core/user_tags.mk @@ -516,7 +516,6 @@ GRANDFATHERED_USER_MODULES += \ signature-tools \ simg2img \ simulator \ - slang \ soslim \ spec-progress \ sqlite3 \ |