commit abfa40776f126c1c2ef5b070ef59a5a9a30807a9
author Colin Cross <ccross@android.com> Mon Oct 09 15:46:15 2017 -0700
committer Colin Cross <ccross@android.com> Mon Oct 09 17:37:49 2017 -0700
tree 7e2c97b7fb52f5e366e4fd038d40dd9b4a44249c
parent bc29d906bce64e21f2d2f614f6b01a2574bd9db5

Add hostdex support for soong

When LOCAL_IS_HOST_MODULE is set LOCAL_BUILT_MODULE is the same
as common_javalib.jar, and dexpreopting shouldn't be enabled.

Bug: 67600882
Test: m -j checkbuild
Change-Id: I7397fa430ebc18d5cb6ba71b06e343180f09ae08

core/soong_java_prebuilt.mk

diff --git a/core/soong_java_prebuilt.mk b/core/soong_java_prebuilt.mk
index 8226d50..b251d7c 100644
--- a/core/soong_java_prebuilt.mk
+++ b/core/soong_java_prebuilt.mk
@@ -35,30 +35,34 @@
 endif # TURBINE_DISABLED != false
 
 ifdef LOCAL_SOONG_DEX_JAR
-  $(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(common_javalib.jar)))
+  ifndef LOCAL_IS_HOST_MODULE
+    $(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(common_javalib.jar)))
 
-  # defines built_odex along with rule to install odex
-  include $(BUILD_SYSTEM)/dex_preopt_odex_install.mk
+    # defines built_odex along with rule to install odex
+    include $(BUILD_SYSTEM)/dex_preopt_odex_install.mk
 
-  ifdef LOCAL_DEX_PREOPT
-    ifneq ($(dexpreopt_boot_jar_module),) # boot jar
-      # boot jar's rules are defined in dex_preopt.mk
-      dexpreopted_boot_jar := $(DEXPREOPT_BOOT_JAR_DIR_FULL_PATH)/$(dexpreopt_boot_jar_module)_nodex.jar
-      $(eval $(call copy-one-file,$(dexpreopted_boot_jar),$(LOCAL_BUILT_MODULE)))
+    ifdef LOCAL_DEX_PREOPT
+      ifneq ($(dexpreopt_boot_jar_module),) # boot jar
+        # boot jar's rules are defined in dex_preopt.mk
+        dexpreopted_boot_jar := $(DEXPREOPT_BOOT_JAR_DIR_FULL_PATH)/$(dexpreopt_boot_jar_module)_nodex.jar
+        $(eval $(call copy-one-file,$(dexpreopted_boot_jar),$(LOCAL_BUILT_MODULE)))
 
-      # For libart boot jars, we don't have .odex files.
-    else # ! boot jar
-      $(built_odex): PRIVATE_MODULE := $(LOCAL_MODULE)
-      # Use pattern rule - we may have multiple built odex files.
+        # For libart boot jars, we don't have .odex files.
+      else # ! boot jar
+        $(built_odex): PRIVATE_MODULE := $(LOCAL_MODULE)
+        # Use pattern rule - we may have multiple built odex files.
 $(built_odex) : $(dir $(LOCAL_BUILT_MODULE))% : $(common_javalib.jar)
 	@echo "Dexpreopt Jar: $(PRIVATE_MODULE) ($@)"
 	$(call dexpreopt-one-file,$<,$@)
 
-     $(eval $(call dexpreopt-copy-jar,$(common_javalib.jar),$(LOCAL_BUILT_MODULE),$(LOCAL_DEX_PREOPT)))
-    endif # ! boot jar
-  else # LOCAL_DEX_PREOPT
-    $(eval $(call copy-one-file,$(common_javalib.jar),$(LOCAL_BUILT_MODULE)))
-  endif # LOCAL_DEX_PREOPT
+       $(eval $(call dexpreopt-copy-jar,$(common_javalib.jar),$(LOCAL_BUILT_MODULE),$(LOCAL_DEX_PREOPT)))
+      endif # ! boot jar
+    else # LOCAL_DEX_PREOPT
+      $(eval $(call copy-one-file,$(common_javalib.jar),$(LOCAL_BUILT_MODULE)))
+    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)
 else