Merge "Add hostdex support for soong" (9f588bcd) · Commits · e / os / android_build

core/soong_java_prebuilt.mk

+24 −20

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ endif
		endif # TURBINE_DISABLED != false

		ifdef LOCAL_SOONG_DEX_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
		@@ -59,6 +60,9 @@ $(built_odex) : $(dir $(LOCAL_BUILT_MODULE))% : $(common_javalib.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