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

Commit 4c8655cd authored by Jihoon Kang's avatar Jihoon Kang
Browse files

Revert "Revert "Do not depend on make intermediates for soong ge..." 

Revert submission 33517348-revert-33335626-no_deps_required-HBHJPMNOHF

Reason for revert: Attempting resubmission

Reverted changes: /q/submissionid:33517348-revert-33335626-no_deps_required-HBHJPMNOHF

Change-Id: I7c052819900876afb5bea5006da9c1158f510847
parent e0916aa2

core/base_rules.mk

+3 −6
Original line number Diff line number Diff line
@@ -505,12 +505,8 @@ my_path_comp := 


my_installed_symlinks :=



ifneq (,$(LOCAL_SOONG_INSTALLED_MODULE))

  # Soong already generated the copy rule, but make the installed location depend on the Make

  # copy of the intermediates for now, as some rules that collect intermediates may expect

  # them to exist.

  $(LOCAL_INSTALLED_MODULE): $(LOCAL_BUILT_MODULE)

else ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE))

ifeq (,$(LOCAL_SOONG_INSTALLED_MODULE))

ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE))

  $(LOCAL_INSTALLED_MODULE): PRIVATE_POST_INSTALL_CMD := $(LOCAL_POST_INSTALL_CMD)

  $(LOCAL_INSTALLED_MODULE): $(LOCAL_BUILT_MODULE)

	@echo "Install: $@"
@@ -530,6 +526,7 @@ else ifneq (true,$(LOCAL_UNINSTALLABLE_MODULE)) 
  $(my_all_targets) : | $(my_installed_symlinks)



endif # !LOCAL_UNINSTALLABLE_MODULE

endif # !LOCAL_SOONG_INSTALLED_MODULE



# Add dependencies on LOCAL_SOONG_INSTALL_SYMLINKS if we're installing any kind of module, not just

# ones that set LOCAL_SOONG_INSTALLED_MODULE. This is so we can have a soong module that only

core/soong_java_prebuilt.mk

+0 −3
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ include $(BUILD_SYSTEM)/base_rules.mk 
ifdef LOCAL_SOONG_CLASSES_JAR

  $(eval $(call copy-one-file,$(LOCAL_SOONG_CLASSES_JAR),$(full_classes_jar)))

  $(eval $(call copy-one-file,$(LOCAL_SOONG_CLASSES_JAR),$(full_classes_pre_proguard_jar)))

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



  ifneq ($(TURBINE_ENABLED),false)

    ifdef LOCAL_SOONG_HEADER_JAR
@@ -116,9 +115,7 @@ ifdef LOCAL_SOONG_DEX_JAR 
    endif # is_boot_jar



    $(eval $(call copy-one-file,$(LOCAL_SOONG_DEX_JAR),$(common_javalib.jar)))

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

    ifdef LOCAL_SOONG_CLASSES_JAR

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

      ifneq ($(TURBINE_ENABLED),false)

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

      endif