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

Commit 46020556 authored by Colin Cross's avatar Colin Cross
Browse files

Add dependencies on classes.jar for soong modules 

Make javalib.jar files copied from soong modules depend on the copied
classes.jar files.

Test: rm classes.jar && m modulename && ls classes.jar
Test: rm classes.jar && m javalib.jar && ls classes.jar
Change-Id: I5ab77960a43b07c214969834cb3472ed121c8828
parent f4f94ab5

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)