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

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

Merge changes from topic "b/278060169" 

* changes:
  Replace touch -a with comment
  BUILD_NUMBER and BUILD_HOSTNAME doesn't affect kati regeneration
parents 8485145b 54403316

Changes.md

+18 −0
Original line number Diff line number Diff line
@@ -493,6 +493,24 @@ $(call dist-for-goals,foo,bar/baz) 


will copy `bar/baz` into `$DIST_DIR/baz` when `m foo dist` is run.



#### FILE_NAME_TAG  {#FILE_NAME_TAG}



To embed the `BUILD_NUMBER` (or for local builds, `eng.${USER}`), include

`FILE_NAME_TAG_PLACEHOLDER` in the destination:



``` make

# you can use dist-for-goals-with-filenametag function

$(call dist-for-goals-with-filenametag,foo,bar.zip)

# or use FILE_NAME_TAG_PLACEHOLDER manually

$(call dist-for-goals,foo,bar.zip:baz-FILE_NAME_TAG_PLACEHOLDER.zip)

```



Which will produce `$DIST_DIR/baz-1234567.zip` on build servers which set

`BUILD_NUMBER=1234567`, or `$DIST_DIR/baz-eng.builder.zip` for local builds.



If you just want to append `BUILD_NUMBER` at the end of basename, use

`dist-for-goals-with-filenametag` instead of `dist-for-goals`.



#### Renames during copy



Instead of specifying just a file, a destination name can be specified,

core/Makefile

+16 −16
Original line number Diff line number Diff line
@@ -711,7 +711,7 @@ name := $(TARGET_PRODUCT) 
ifeq ($(TARGET_BUILD_TYPE),debug)

  name := $(name)_debug

endif

name := $(name)-apkcerts-$(FILE_NAME_TAG)

name := $(name)-apkcerts

intermediates := \

	$(call intermediates-dir-for,PACKAGING,apkcerts)

APKCERTS_FILE := $(intermediates)/$(name).txt
@@ -5710,7 +5710,7 @@ name := $(TARGET_PRODUCT) 
ifeq ($(TARGET_BUILD_TYPE),debug)

  name := $(name)_debug

endif

name := $(name)-target_files-$(FILE_NAME_TAG)

name := $(name)-target_files



intermediates := $(call intermediates-dir-for,PACKAGING,target_files)

BUILT_TARGET_FILES_DIR := $(intermediates)/$(name).zip.list
@@ -6490,7 +6490,7 @@ $(call declare-container-license-deps,$(BUILT_TARGET_FILES_PACKAGE), $(INSTALLED 
            $(BUILT_KERNEL_CONFIGS_FILE) \

            $(BUILT_KERNEL_VERSION_FILE),$(BUILT_TARGET_FILES_PACKAGE):)



$(call dist-for-goals, target-files-package, $(BUILT_TARGET_FILES_PACKAGE))

$(call dist-for-goals-with-filenametag, target-files-package, $(BUILT_TARGET_FILES_PACKAGE))



# -----------------------------------------------------------------

# NDK Sysroot Package
@@ -6525,7 +6525,7 @@ product_name := $(TARGET_PRODUCT) 
ifeq ($(TARGET_BUILD_TYPE),debug)

  product_name := $(product_name)_debug

endif

name := $(product_name)-ota-$(FILE_NAME_TAG)

name := $(product_name)-ota



INTERNAL_OTA_PACKAGE_TARGET := $(PRODUCT_OUT)/$(name).zip

INTERNAL_OTA_METADATA := $(PRODUCT_OUT)/ota_metadata
@@ -6545,7 +6545,7 @@ $(call declare-container-license-deps,$(INTERNAL_OTA_PACKAGE_TARGET),$(BUILT_TAR 
otapackage: $(INTERNAL_OTA_PACKAGE_TARGET)



ifeq ($(BOARD_BUILD_RETROFIT_DYNAMIC_PARTITIONS_OTA_PACKAGE),true)

name := $(product_name)-ota-retrofit-$(FILE_NAME_TAG)

name := $(product_name)-ota-retrofit



INTERNAL_OTA_RETROFIT_DYNAMIC_PARTITIONS_PACKAGE_TARGET := $(PRODUCT_OUT)/$(name).zip

$(INTERNAL_OTA_RETROFIT_DYNAMIC_PARTITIONS_PACKAGE_TARGET): KEY_CERT_PAIR := $(DEFAULT_KEY_CERT_PAIR)
@@ -6566,7 +6566,7 @@ otapackage otardppackage: $(INTERNAL_OTA_RETROFIT_DYNAMIC_PARTITIONS_PACKAGE_TAR 
endif # BOARD_BUILD_RETROFIT_DYNAMIC_PARTITIONS_OTA_PACKAGE



ifneq ($(BOARD_PARTIAL_OTA_UPDATE_PARTITIONS_LIST),)

name := $(product_name)-partial-ota-$(FILE_NAME_TAG)

name := $(product_name)-partial-ota



INTERNAL_OTA_PARTIAL_PACKAGE_TARGET := $(PRODUCT_OUT)/$(name).zip

$(INTERNAL_OTA_PARTIAL_PACKAGE_TARGET): KEY_CERT_PAIR := $(DEFAULT_KEY_CERT_PAIR)
@@ -6666,9 +6666,9 @@ ifeq ($(TARGET_BUILD_TYPE),debug) 
endif



# The path to the zip file containing binaries with symbols.

SYMBOLS_ZIP := $(PRODUCT_OUT)/$(name)-symbols-$(FILE_NAME_TAG).zip

SYMBOLS_ZIP := $(PRODUCT_OUT)/$(name)-symbols.zip

# The path to a file containing mappings from elf IDs to filenames.

SYMBOLS_MAPPING := $(PRODUCT_OUT)/$(name)-symbols-mapping-$(FILE_NAME_TAG).textproto

SYMBOLS_MAPPING := $(PRODUCT_OUT)/$(name)-symbols-mapping.textproto

.KATI_READONLY := SYMBOLS_ZIP SYMBOLS_MAPPING

# For apps_only build we'll establish the dependency later in build/make/core/main.mk.

ifeq (,$(TARGET_BUILD_UNBUNDLED))
@@ -6743,7 +6743,7 @@ name := $(TARGET_PRODUCT) 
ifeq ($(TARGET_BUILD_TYPE),debug)

  name := $(name)_debug

endif

name := $(name)-apps-$(FILE_NAME_TAG)

name := $(name)-apps



APPS_ZIP := $(PRODUCT_OUT)/$(name).zip

$(APPS_ZIP): $(FULL_SYSTEMIMAGE_DEPS)
@@ -6794,9 +6794,9 @@ endif # EMMA_INSTRUMENT=true 
#



# The path to the zip file containing proguard dictionaries.

PROGUARD_DICT_ZIP := $(PRODUCT_OUT)/$(TARGET_PRODUCT)-proguard-dict-$(FILE_NAME_TAG).zip

PROGUARD_DICT_ZIP := $(PRODUCT_OUT)/$(TARGET_PRODUCT)-proguard-dict.zip

# The path to the zip file containing mappings from dictionary hashes to filenames.

PROGUARD_DICT_MAPPING := $(PRODUCT_OUT)/$(TARGET_PRODUCT)-proguard-dict-mapping-$(FILE_NAME_TAG).textproto

PROGUARD_DICT_MAPPING := $(PRODUCT_OUT)/$(TARGET_PRODUCT)-proguard-dict-mapping.textproto

.KATI_READONLY := PROGUARD_DICT_ZIP PROGUARD_DICT_MAPPING

# For apps_only build we'll establish the dependency later in build/make/core/main.mk.

ifeq (,$(TARGET_BUILD_UNBUNDLED))
@@ -6825,7 +6825,7 @@ endif 
#------------------------------------------------------------------

# A zip of Proguard usage files.

#

PROGUARD_USAGE_ZIP := $(PRODUCT_OUT)/$(TARGET_PRODUCT)-proguard-usage-$(FILE_NAME_TAG).zip

PROGUARD_USAGE_ZIP := $(PRODUCT_OUT)/$(TARGET_PRODUCT)-proguard-usage.zip

# For apps_only build we'll establish the dependency later in build/make/core/main.mk.

ifeq (,$(TARGET_BUILD_UNBUNDLED))

$(PROGUARD_USAGE_ZIP): \
@@ -7002,7 +7002,7 @@ name := $(TARGET_PRODUCT) 
ifeq ($(TARGET_BUILD_TYPE),debug)

  name := $(name)_debug

endif

name := $(name)-img-$(FILE_NAME_TAG)

name := $(name)-img



INTERNAL_UPDATE_PACKAGE_TARGET := $(PRODUCT_OUT)/$(name).zip
@@ -7018,7 +7018,7 @@ $(call declare-container-license-deps,$(INTERNAL_UPDATE_PACKAGE_TARGET),$(BUILT_ 


.PHONY: updatepackage

updatepackage: $(INTERNAL_UPDATE_PACKAGE_TARGET)

$(call dist-for-goals,updatepackage,$(INTERNAL_UPDATE_PACKAGE_TARGET))

$(call dist-for-goals-with-filenametag,updatepackage,$(INTERNAL_UPDATE_PACKAGE_TARGET))





# -----------------------------------------------------------------
@@ -7147,7 +7147,7 @@ INTERNAL_EMULATOR_PACKAGE_FILES += \ 
        $(INSTALLED_SYSTEMIMAGE_TARGET) \

        $(INSTALLED_USERDATAIMAGE_TARGET)



name := $(TARGET_PRODUCT)-emulator-$(FILE_NAME_TAG)

name := $(TARGET_PRODUCT)-emulator



INTERNAL_EMULATOR_PACKAGE_TARGET := $(PRODUCT_OUT)/$(name).zip
@@ -7175,7 +7175,7 @@ sdk_dir := $(HOST_OUT)/sdk/$(TARGET_PRODUCT) 
ifneq ($(HOST_OS),linux)

  $(error Building the monolithic SDK is only supported on Linux)

endif

sdk_name := android-sdk_$(FILE_NAME_TAG)

sdk_name := android-sdk

INTERNAL_SDK_HOST_OS_NAME := linux-$(SDK_HOST_ARCH)

sdk_name := $(sdk_name)_$(INTERNAL_SDK_HOST_OS_NAME)

core/config.mk

+1 −0
Original line number Diff line number Diff line
@@ -856,6 +856,7 @@ endif 
.KATI_READONLY := MAINLINE_SEPOLICY_DEV_CERTIFICATES



BUILD_NUMBER_FROM_FILE := $$(cat $(SOONG_OUT_DIR)/build_number.txt)

BUILD_HOSTNAME_FROM_FILE := $$(cat $(SOONG_OUT_DIR)/build_hostname.txt)

BUILD_DATETIME_FROM_FILE := $$(cat $(BUILD_DATETIME_FILE))



# SEPolicy versions

core/host_java_library.mk

+0 −2
Original line number Diff line number Diff line
@@ -98,8 +98,6 @@ $(full_classes_combined_jar): PRIVATE_DONT_DELETE_JAR_META_INF := $(LOCAL_DONT_D 
$(full_classes_combined_jar): $(full_classes_compiled_jar) \

                              $(jar_manifest_file) \

                              $(full_static_java_libs) | $(MERGE_ZIPS)

	$(if $(PRIVATE_JAR_MANIFEST), $(hide) sed -e "s/%BUILD_NUMBER%/$(BUILD_NUMBER_FROM_FILE)/" \

            $(PRIVATE_JAR_MANIFEST) > $(dir $@)/manifest.mf)

	$(MERGE_ZIPS) -j --ignore-duplicates $(if $(PRIVATE_JAR_MANIFEST),-m $(dir $@)/manifest.mf) \

            $(if $(PRIVATE_DONT_DELETE_JAR_META_INF),,-stripDir META-INF -zipToNotStrip $<) \

            $@ $< $(PRIVATE_STATIC_JAVA_LIBRARIES)

core/java.mk

+0 −2
Original line number Diff line number Diff line
@@ -296,8 +296,6 @@ $(full_classes_combined_jar): PRIVATE_DONT_DELETE_JAR_META_INF := $(LOCAL_DONT_D 
$(full_classes_combined_jar): $(full_classes_compiled_jar) \

                              $(jar_manifest_file) \

                              $(full_static_java_libs) | $(MERGE_ZIPS)

	$(if $(PRIVATE_JAR_MANIFEST), $(hide) sed -e "s/%BUILD_NUMBER%/$(BUILD_NUMBER_FROM_FILE)/" \

            $(PRIVATE_JAR_MANIFEST) > $(dir $@)/manifest.mf)

	$(MERGE_ZIPS) -j --ignore-duplicates $(if $(PRIVATE_JAR_MANIFEST),-m $(dir $@)/manifest.mf) \

            $(if $(PRIVATE_DONT_DELETE_JAR_META_INF),,-stripDir META-INF -zipToNotStrip $<) \

            $@ $< $(PRIVATE_STATIC_JAVA_LIBRARIES)