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

Commit c8241ca1 authored by Shih-wei Liao's avatar Shih-wei Liao Committed by Android (Google) Code Review
Browse files

Merge "Make naming consistent: llvm-rs-cc and llvm-rs-link."

parents 0ce72c45 d01fadb6

core/config.mk

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

core/definitions.mk

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

core/java.mk

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

core/user_tags.mk

+0 −1
Original line number Diff line number Diff line
@@ -516,7 +516,6 @@ GRANDFATHERED_USER_MODULES += \ 
	signature-tools \

	simg2img \

	simulator \

	slang \

	soslim \

	spec-progress \

	sqlite3 \