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

Commit c85f6d56 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes Id8365ce4,I952515c2 

* changes:
  Convert more uses of $(ACP) to `cp`
  Remove more tab characters from commands
parents e246508e 288bedfc

core/Makefile

+3 −13
Original line number Diff line number Diff line
@@ -1224,19 +1224,9 @@ endif # TARGET_BUILD_APPS 
# The kernel isn't really a module, so to get its module file in there, we

# make the target NOTICE files depend on this particular file too, which will

# then be in the right directory for the find in combine-notice-files to work.

$(kernel_notice_file): \

	    $(BUILD_SYSTEM)/LINUX_KERNEL_COPYING \

	    | $(ACP)

	@echo Copying: $@

	$(hide) mkdir -p $(dir $@)

	$(hide) $(ACP) $< $@

$(eval $(call copy-one-file,$(BUILD_SYSTEM)/LINUX_KERNEL_COPYING,$(kernel_notice_file)))



$(winpthreads_notice_file): \

	    $(BUILD_SYSTEM)/WINPTHREADS_COPYING \

	    | $(ACP)

	@echo Copying: $@

	$(hide) mkdir -p $(dir $@)

	$(hide) $(ACP) $< $@

$(eval $(call copy-one-file,$(BUILD_SYSTEM)/WINPTHREADS_COPYING,$(winpthreads_notice_file)))





# #################################################################
@@ -4081,7 +4071,7 @@ endif 
endif

ifeq ($(BREAKPAD_GENERATE_SYMBOLS),true)

	@# If breakpad symbols have been generated, add them to the zip.

	$(hide) $(ACP) -r $(TARGET_OUT_BREAKPAD) $(zip_root)/BREAKPAD

	$(hide) cp -R $(TARGET_OUT_BREAKPAD) $(zip_root)/BREAKPAD

endif

ifdef BOARD_PREBUILT_VENDORIMAGE

	$(hide) mkdir -p $(zip_root)/IMAGES

core/definitions.mk

+182 −182
Original line number Diff line number Diff line
@@ -1853,15 +1853,15 @@ $(hide) for GENERATED_MANIFEST_FILE in `find $(1) \ 
  -name Manifest.java 2> /dev/null`; do \

    dir=`awk '/package/{gsub(/\./,"/",$$2);gsub(/;/,"",$$2);print $$2;exit}' $$GENERATED_MANIFEST_FILE`; \

    mkdir -p $(TARGET_COMMON_OUT_ROOT)/R/$$dir; \

    $(ACP) -fp $$GENERATED_MANIFEST_FILE $(TARGET_COMMON_OUT_ROOT)/R/$$dir; \

    cp $$GENERATED_MANIFEST_FILE $(TARGET_COMMON_OUT_ROOT)/R/$$dir; \

  done;

$(hide) for GENERATED_R_FILE in `find $(1) \

  -name R.java 2> /dev/null`; do \

    dir=`awk '/package/{gsub(/\./,"/",$$2);gsub(/;/,"",$$2);print $$2;exit}' $$GENERATED_R_FILE`; \

    mkdir -p $(TARGET_COMMON_OUT_ROOT)/R/$$dir; \

    $(ACP) -fp $$GENERATED_R_FILE $(TARGET_COMMON_OUT_ROOT)/R/$$dir \

    cp $$GENERATED_R_FILE $(TARGET_COMMON_OUT_ROOT)/R/$$dir \

      || exit 31; \

    $(ACP) -fp $$GENERATED_R_FILE $(2) || exit 32; \

    cp $$GENERATED_R_FILE $(2) || exit 32; \

  done;

@# Ensure that the target file is always created, i.e. also in case we did not

@# enter the GENERATED_R_FILE-loop above. This avoids unnecessary rebuilding.

core/package_internal.mk

+1 −1
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ $(LOCAL_BUILT_MODULE): PRIVATE_RESOURCE_INTERMEDIATES_DIR := $(intermediates.COM 
$(LOCAL_BUILT_MODULE) : $(jni_shared_libraries)

$(LOCAL_BUILT_MODULE) : $(JAR_ARGS) $(SOONG_ZIP) $(MERGE_ZIPS) $(ZIP2ZIP)

$(LOCAL_BUILT_MODULE): PRIVATE_RES_PACKAGE := $(my_res_package)

$(LOCAL_BUILT_MODULE) : $(my_res_package) $(AAPT2) | $(ACP)

$(LOCAL_BUILT_MODULE) : $(my_res_package) $(AAPT2)

ifdef LOCAL_COMPRESSED_MODULE

$(LOCAL_BUILT_MODULE) : $(MINIGZIP)

endif

core/tasks/sdk-addon.mk

+4 −4
Original line number Diff line number Diff line
@@ -114,20 +114,20 @@ $(full_target): PRIVATE_DOCS_DIRS := $(addprefix $(OUT_DOCS)/, $(doc_modules)) 


$(full_target): PRIVATE_STAGING_DIR := $(call append-path,$(staging),$(addon_dir_leaf))



$(full_target): $(sdk_addon_deps) | $(ACP) $(SOONG_ZIP)

$(full_target): $(sdk_addon_deps) | $(SOONG_ZIP)

	@echo Packaging SDK Addon: $@

	$(hide) mkdir -p $(PRIVATE_STAGING_DIR)/docs

	$(hide) for d in $(PRIVATE_DOCS_DIRS); do \

	    $(ACP) -r $$d $(PRIVATE_STAGING_DIR)/docs ;\

	    cp -R $$d $(PRIVATE_STAGING_DIR)/docs ;\

	  done

	$(hide) mkdir -p $(dir $@)

	$(hide) $(SOONG_ZIP) -o $@ -C $(dir $(PRIVATE_STAGING_DIR)) -D $(PRIVATE_STAGING_DIR)



$(full_target_img): PRIVATE_STAGING_DIR := $(call append-path,$(staging),$(addon_dir_img))/images/$(TARGET_CPU_ABI)

$(full_target_img): $(full_target) $(addon_img_source_prop) | $(ACP) $(SOONG_ZIP)

$(full_target_img): $(full_target) $(addon_img_source_prop) | $(SOONG_ZIP)

	@echo Packaging SDK Addon System-Image: $@

	$(hide) mkdir -p $(dir $@)

	$(ACP) -r $(PRODUCT_OUT)/data $(PRIVATE_STAGING_DIR)/data

	cp -R $(PRODUCT_OUT)/data $(PRIVATE_STAGING_DIR)/data

	$(hide) $(SOONG_ZIP) -o $@ -C $(dir $(PRIVATE_STAGING_DIR)) -D $(PRIVATE_STAGING_DIR)

core/tasks/tools/compatibility.mk

+2 −2
Original line number Diff line number Diff line
@@ -53,8 +53,8 @@ $(compatibility_zip): $(test_artifacts) $(test_tools) $(test_suite_prebuilt_tool 
	$(hide) mkdir -p $(PRIVATE_OUT_DIR)/tools $(PRIVATE_OUT_DIR)/testcases

	$(hide) echo $(BUILD_NUMBER_FROM_FILE) > $(PRIVATE_OUT_DIR)/tools/version.txt

# Copy tools

	$(hide) $(ACP) -fp $(PRIVATE_TOOLS) $(PRIVATE_OUT_DIR)/tools

	$(if $(PRIVATE_DYNAMIC_CONFIG),$(hide) $(ACP) -fp $(PRIVATE_DYNAMIC_CONFIG) $(PRIVATE_OUT_DIR)/testcases/$(PRIVATE_SUITE_NAME).dynamic)

	$(hide) cp $(PRIVATE_TOOLS) $(PRIVATE_OUT_DIR)/tools

	$(if $(PRIVATE_DYNAMIC_CONFIG),$(hide) cp $(PRIVATE_DYNAMIC_CONFIG) $(PRIVATE_OUT_DIR)/testcases/$(PRIVATE_SUITE_NAME).dynamic)

	$(hide) find $(dir $@)/$(PRIVATE_NAME) | sort >$@.list

	$(hide) $(SOONG_ZIP) -d -o $@ -C $(dir $@) -l $@.list