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

Commit f7b32bfe authored by Shih-wei Liao's avatar Shih-wei Liao
Browse files

Enable LLVM_RS_LINK. No longer forking an LLVM linker inside llvm-rs-cc. 

Change-Id: I2ebc6ec759daf36d1e77fa8e30147ab8e40b44fc
parent 8921ea69

core/config.mk

+1 −0
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ JARJAR := $(HOST_OUT_JAVA_LIBRARIES)/jarjar.jar 
PROGUARD := external/proguard/bin/proguard.sh

JAVATAGS := build/tools/java-event-log-tags.py

LLVM_RS_CC := $(HOST_OUT_EXECUTABLES)/llvm-rs-cc$(HOST_EXECUTABLE_SUFFIX)

LLVM_RS_LINK := $(HOST_OUT_EXECUTABLES)/llvm-rs-link$(HOST_EXECUTABLE_SUFFIX)

DEXOPT := $(HOST_OUT_EXECUTABLES)/dexopt$(HOST_EXECUTABLE_SUFFIX)

DEXPREOPT := dalvik/tools/dex-preopt

core/definitions.mk

+2 −0
Original line number Diff line number Diff line
@@ -774,6 +774,8 @@ $(hide) $(LLVM_RS_CC) \ 
  -a $@ -MD \

  $(foreach inc,$(PRIVATE_RS_INCLUDES),$(addprefix -I , $(inc))) \

  $(PRIVATE_RS_SOURCE_FILES)

$(hide) $(LLVM_RS_LINK) \

  $(PRIVATE_RS_OUTPUR_DIR)/res/raw/*.bc

$(hide) mkdir -p $(dir $@)

$(hide) touch $@

endef