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

Commit cdaf748e authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge changes I12810c1b,I62287a80,Ied96fdc3 

am: a65b01fc

* commit 'a65b01fc':
  Remove LOCAL_ACP_UNAVAILABLE
  Remove unused dependencies on $(ACP)
  Replace some uses of acp with cp
parents 1d59db07 a65b01fc

core/Makefile

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

$(target_notice_file_html_gz): $(target_notice_file_html) | $(MINIGZIP)

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

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

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

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)

	$(copy-file-to-target)





# if we've been run my mm, mmm, etc, don't reinstall this every time

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

endif









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

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

	@echo "Install system fs image: $@"

	@echo "Install system fs image: $@"

	$(copy-file-to-target)

	$(copy-file-to-target)

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

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

core/base_rules.mk

+1 −15
Original line number Original line Diff line number Diff line
@@ -299,26 +299,12 @@ $(foreach c, $(my_path_components),\ 
## Module installation rule

## Module installation rule

###########################################################

###########################################################





# Some hosts do not have ACP; override the LOCAL version if that's the case.

ifneq ($(strip $(HOST_ACP_UNAVAILABLE)),)

  LOCAL_ACP_UNAVAILABLE := $(strip $(HOST_ACP_UNAVAILABLE))

endif



ifndef LOCAL_UNINSTALLABLE_MODULE

ifndef LOCAL_UNINSTALLABLE_MODULE

  # Define a copy rule to install the module.

  # acp and libraries that it uses can't use acp for

  # installation;  hence, LOCAL_ACP_UNAVAILABLE.

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

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

ifneq ($(LOCAL_ACP_UNAVAILABLE),true)

$(LOCAL_INSTALLED_MODULE): $(LOCAL_BUILT_MODULE)

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

	@echo "Install: $@"

	@echo "Install: $@"

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

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

	$(PRIVATE_POST_INSTALL_CMD)

	$(PRIVATE_POST_INSTALL_CMD)

else

$(LOCAL_INSTALLED_MODULE): $(LOCAL_BUILT_MODULE)

	@echo "Install: $@"

	$(copy-file-to-target-with-cp)

endif





# Rule to install the module's companion init.rc.

# Rule to install the module's companion init.rc.

my_init_rc_installed :=

my_init_rc_installed :=

core/binary.mk

+1 −1
Original line number Original line 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 := $(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: $@"

	@echo "Copy: $@"

	$(copy-file-to-target)

	$(copy-file-to-target)

core/clear_vars.mk

+0 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,6 @@ LOCAL_EXPORT_PACKAGE_RESOURCES:= 
LOCAL_MANIFEST_PACKAGE_NAME:=

LOCAL_MANIFEST_PACKAGE_NAME:=

LOCAL_PACKAGE_SPLITS:=

LOCAL_PACKAGE_SPLITS:=

LOCAL_REQUIRED_MODULES:=

LOCAL_REQUIRED_MODULES:=

LOCAL_ACP_UNAVAILABLE:=

LOCAL_MODULE_TAGS:=

LOCAL_MODULE_TAGS:=

LOCAL_SRC_FILES:=

LOCAL_SRC_FILES:=

LOCAL_SRC_FILES_EXCLUDE:=

LOCAL_SRC_FILES_EXCLUDE:=

core/definitions.mk

+11 −9
Original line number Original line Diff line number Diff line
@@ -2363,7 +2363,7 @@ endef 
# $(1): source file

# $(1): source file

# $(2): destination file

# $(2): destination file

define copy-one-file

define copy-one-file

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

$(2): $(1)

	@echo "Copy: $$@"

	@echo "Copy: $$@"

	$$(copy-file-to-target)

	$$(copy-file-to-target)

endef

endef
@@ -2384,7 +2384,7 @@ endef 
# $(1): source file

# $(1): source file

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

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

define copy-xml-file-checked

define copy-xml-file-checked

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

$(2): $(1)

	@echo "Copy xml: $$@"

	@echo "Copy xml: $$@"

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

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

	$$(copy-file-to-target)

	$$(copy-file-to-target)
@@ -2399,13 +2399,15 @@ endef 
# Copy a single file from one place to another,

# Copy a single file from one place to another,

# preserving permissions and overwriting any existing

# preserving permissions and overwriting any existing

# file.

# file.

# We disable the "-t" option for acp cannot handle

# When we used acp, it could not handle high resolution timestamps

# high resolution timestamp correctly on file systems like ext4.

# on file systems like ext4. Because of that, '-t' option was disabled

# Therefore copy-file-to-target is the same as copy-file-to-new-target.

# and copy-file-to-target was identical to copy-file-to-new-target.

# Keep the behavior until we audit and ensure that switching this back

# won't break anything.

define copy-file-to-target

define copy-file-to-target

@mkdir -p $(dir $@)

@mkdir -p $(dir $@)

$(hide) rm -f $@

$(hide) rm -f $@

$(hide) $(ACP) -p $< $@

$(hide) cp $< $@

endef

endef





# The same as copy-file-to-target, but use the local

# The same as copy-file-to-target, but use the local
@@ -2436,7 +2438,7 @@ endef 
define copy-file-to-new-target

define copy-file-to-new-target

@mkdir -p $(dir $@)

@mkdir -p $(dir $@)

$(hide) rm -f $@

$(hide) rm -f $@

$(hide) $(ACP) -p $< $@

$(hide) cp $< $@

endef

endef





# The same as copy-file-to-new-target, but use the local

# The same as copy-file-to-new-target, but use the local
@@ -2573,7 +2575,7 @@ define add-radio-file 
endef

endef

define add-radio-file-internal

define add-radio-file-internal

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

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

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

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

	$$(transform-prebuilt-to-target)

	$$(transform-prebuilt-to-target)

endef

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

define add-radio-file-checked-internal

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

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

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

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

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

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

	$$(transform-prebuilt-to-target)

	$$(transform-prebuilt-to-target)

endef

endef