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

Commit 0f4fe049 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Add hostdex support for soong" am: 9f588bcd am: a0dd1e08 am: 1e3df664 

am: b4f6f611

Change-Id: I803f5f8b97b3cef3c69f53a449468d857ee831ac
parents 78bd3f13 b4f6f611

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