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

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

Merge "Add dependencies on classes.jar for soong modules" 

am: 8bef6515

Change-Id: I578d276269a9fe03ef1d54ce799a0f7648acadce
parents 70e5a23d 8bef6515

core/soong_java_prebuilt.mk

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 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)))

    $(eval $(call add-dependency,$(common_javalib.jar),$(full_classes_jar) $(full_classes_header_jar)))



    # defines built_odex along with rule to install odex

    include $(BUILD_SYSTEM)/dex_preopt_odex_install.mk
@@ -62,6 +63,7 @@ $(built_odex) : $(dir $(LOCAL_BUILT_MODULE))% : $(common_javalib.jar) 
    endif # LOCAL_DEX_PREOPT

  else # LOCAL_IS_HOST_MODULE

    $(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(LOCAL_BUILT_MODULE)))

    $(eval $(call add-dependency,$(LOCAL_BUILT_MODULE),$(full_classes_jar) $(full_classes_header_jar)))

  endif



  java-dex : $(LOCAL_BUILT_MODULE)