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

Commit 7f016150 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Remove unused dependencies on $(ACP) 

Most of these are calling to copy-file-to-target or similar, which no
longer use $(ACP).

Change-Id: I62287a80c577c34df587b74e70055c2f56050ce7
parent f1a98af5

core/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -674,7 +674,7 @@ $(eval $(call combine-notice-files, \ 
$(target_notice_file_html_gz): $(target_notice_file_html) | $(MINIGZIP)

	$(hide) $(MINIGZIP) -9 < $< > $@

installed_notice_html_gz := $(TARGET_OUT)/etc/NOTICE.html.gz

$(installed_notice_html_gz): $(target_notice_file_html_gz) | $(ACP)

$(installed_notice_html_gz): $(target_notice_file_html_gz)

	$(copy-file-to-target)



# if we've been run my mm, mmm, etc, don't reinstall this every time
@@ -1142,7 +1142,7 @@ endif 
endif





$(INSTALLED_SYSTEMIMAGE): $(BUILT_SYSTEMIMAGE) $(RECOVERY_FROM_BOOT_PATCH) | $(ACP)

$(INSTALLED_SYSTEMIMAGE): $(BUILT_SYSTEMIMAGE) $(RECOVERY_FROM_BOOT_PATCH)

	@echo "Install system fs image: $@"

	$(copy-file-to-target)

	$(hide) $(call assert-max-image-size,$@ $(RECOVERY_FROM_BOOT_PATCH),$(BOARD_SYSTEMIMAGE_PARTITION_SIZE))

core/base_rules.mk

+1 −1
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ ifndef LOCAL_UNINSTALLABLE_MODULE 
  # installation;  hence, LOCAL_ACP_UNAVAILABLE.

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

ifneq ($(LOCAL_ACP_UNAVAILABLE),true)

$(LOCAL_INSTALLED_MODULE): $(LOCAL_BUILT_MODULE) | $(ACP)

$(LOCAL_INSTALLED_MODULE): $(LOCAL_BUILT_MODULE)

	@echo "Install: $@"

	$(copy-file-to-new-target)

	$(PRIVATE_POST_INSTALL_CMD)

core/binary.mk

+1 −1
Original line number Diff line number Diff line
@@ -528,7 +528,7 @@ $(my_generated_sources): PRIVATE_MODULE := $(my_register_name) 


my_gen_sources_copy := $(patsubst $(generated_sources_dir)/%,$(intermediates)/%,$(filter $(generated_sources_dir)/%,$(my_generated_sources)))



$(my_gen_sources_copy): $(intermediates)/% : $(generated_sources_dir)/% | $(ACP)

$(my_gen_sources_copy): $(intermediates)/% : $(generated_sources_dir)/%

	@echo "Copy: $@"

	$(copy-file-to-target)

core/definitions.mk

+3 −3
Original line number Diff line number Diff line
@@ -2384,7 +2384,7 @@ endef 
# $(1): source file

# $(2): destination file, must end with .xml.

define copy-xml-file-checked

$(2): $(1) | $(ACP)

$(2): $(1)

	@echo "Copy xml: $$@"

	$(hide) xmllint $$< >/dev/null  # Don't print the xml file to stdout.

	$$(copy-file-to-target)
@@ -2575,7 +2575,7 @@ define add-radio-file 
endef

define add-radio-file-internal

INSTALLED_RADIOIMAGE_TARGET += $$(PRODUCT_OUT)/$(2)

$$(PRODUCT_OUT)/$(2) : $$(LOCAL_PATH)/$(1) | $$(ACP)

$$(PRODUCT_OUT)/$(2) : $$(LOCAL_PATH)/$(1)

	$$(transform-prebuilt-to-target)

endef
@@ -2590,7 +2590,7 @@ endef 
define add-radio-file-checked-internal

INSTALLED_RADIOIMAGE_TARGET += $$(PRODUCT_OUT)/$(2)

BOARD_INFO_CHECK += $(3):$(LOCAL_PATH)/$(1)

$$(PRODUCT_OUT)/$(2) : $$(LOCAL_PATH)/$(1) | $$(ACP)

$$(PRODUCT_OUT)/$(2) : $$(LOCAL_PATH)/$(1)

	$$(transform-prebuilt-to-target)

endef

core/dex_preopt.mk

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ define _dexpreopt-boot-jar-remove-classes.dex 
_dbj_jar_no_dex := $(DEXPREOPT_BOOT_JAR_DIR_FULL_PATH)/$(1)_nodex.jar

_dbj_src_jar := $(call intermediates-dir-for,JAVA_LIBRARIES,$(1),,COMMON)/javalib.jar



$$(_dbj_jar_no_dex) : $$(_dbj_src_jar) | $(ACP)

$$(_dbj_jar_no_dex) : $$(_dbj_src_jar)

	$$(call copy-file-to-target)

ifneq ($(DEX_PREOPT_DEFAULT),nostripping)

	$$(call dexpreopt-remove-classes.dex,$$@)