StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add hostdex support for soong"

Browse Source 
am: 9f588bcd15

Change-Id: I78acacc81e1d159c1f4107aa936d68adf4ce11f9
This commit is contained in:
Colin Cross
2017-10-10 22:03:28 +00:00
committed by android-build-merger
parent 589471eb35 9f588bcd15
commit a0dd1e08f2
1 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/soong_java_prebuilt.mk
View File

@@ -35,6 +35,7 @@ endif
endif # TURBINE_DISABLED != false endif # TURBINE_DISABLED != false
ifdef LOCAL_SOONG_DEX_JAR ifdef LOCAL_SOONG_DEX_JAR
ifndef LOCAL_IS_HOST_MODULE
$(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(common_javalib.jar))) $(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(common_javalib.jar)))
# defines built_odex along with rule to install odex # defines built_odex along with rule to install odex
@@ -59,6 +60,9 @@ $(built_odex) : $(dir $(LOCAL_BUILT_MODULE))% : $(common_javalib.jar)
else # LOCAL_DEX_PREOPT else # LOCAL_DEX_PREOPT
$(eval $(call copy-one-file,$(common_javalib.jar),$(LOCAL_BUILT_MODULE))) $(eval $(call copy-one-file,$(common_javalib.jar),$(LOCAL_BUILT_MODULE)))
endif # LOCAL_DEX_PREOPT endif # LOCAL_DEX_PREOPT
else # LOCAL_IS_HOST_MODULE
$(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(LOCAL_BUILT_MODULE)))
endif
java-dex : $(LOCAL_BUILT_MODULE) java-dex : $(LOCAL_BUILT_MODULE)
else else