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

Commit 8e2e2ec4 authored by Cole Faust's avatar Cole Faust Committed by Automerger Merge Worker
Browse files

Merge "Add extra variables to soong.variables" into main am: b78b3340 am:... 

Merge "Add extra variables to soong.variables" into main am: b78b3340 am: 2b24df30 am: 8e6660f7

Original change: https://android-review.googlesource.com/c/platform/build/+/2765709



Change-Id: I4952eeb5dd75955cb572c285861e5657abb88070
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 06b5e27f 8e6660f7

core/soong_config.mk

+7 −0
Original line number Original line Diff line number Diff line
@@ -344,6 +344,11 @@ $(call add_json_map, PartitionVarsForBazelMigrationOnlyDoNotUse) 
    $(call add_json_str, ProductBaseFsPath, $(PRODUCT_$(image_type)_BASE_FS_PATH)) \

    $(call add_json_str, ProductBaseFsPath, $(PRODUCT_$(image_type)_BASE_FS_PATH)) \

    $(call add_json_str, ProductHeadroom, $(PRODUCT_$(image_type)_HEADROOM)) \

    $(call add_json_str, ProductHeadroom, $(PRODUCT_$(image_type)_HEADROOM)) \

    $(call add_json_str, ProductVerityPartition, $(PRODUCT_$(image_type)_VERITY_PARTITION)) \

    $(call add_json_str, ProductVerityPartition, $(PRODUCT_$(image_type)_VERITY_PARTITION)) \

    $(call add_json_str, BoardAvbAddHashtreeFooterArgs, $(BOARD_AVB_$(image_type)_ADD_HASHTREE_FOOTER_ARGS)) \

    $(call add_json_str, BoardAvbKeyPath, $(BOARD_AVB_$(image_type)_KEY_PATH)) \

    $(call add_json_str, BoardAvbAlgorithm, $(BOARD_AVB_$(image_type)_ALGORITHM)) \

    $(call add_json_str, BoardAvbRollbackIndex, $(BOARD_AVB_$(image_type)_ROLLBACK_INDEX)) \

    $(call add_json_str, BoardAvbRollbackIndexLocation, $(BOARD_AVB_$(image_type)_ROLLBACK_INDEX_LOCATION)) \

    $(call end_json_map) \

    $(call end_json_map) \

  )

  )

  $(call end_json_map)

  $(call end_json_map)
@@ -370,6 +375,8 @@ $(call add_json_map, PartitionVarsForBazelMigrationOnlyDoNotUse) 
  $(call add_json_bool, BoardBuildGkiBootImageWithoutRamdisk, $(filter true,$(BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK)))

  $(call add_json_bool, BoardBuildGkiBootImageWithoutRamdisk, $(filter true,$(BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK)))

  $(call add_json_bool, ProductUseDynamicPartitionSize, $(filter true,$(PRODUCT_USE_DYNAMIC_PARTITION_SIZE)))

  $(call add_json_bool, ProductUseDynamicPartitionSize, $(filter true,$(PRODUCT_USE_DYNAMIC_PARTITION_SIZE)))

  $(call add_json_bool, CopyImagesForTargetFilesZip, $(filter true,$(COPY_IMAGES_FOR_TARGET_FILES_ZIP)))

  $(call add_json_bool, CopyImagesForTargetFilesZip, $(filter true,$(COPY_IMAGES_FOR_TARGET_FILES_ZIP)))



  $(call add_json_bool, BoardAvbEnable, $(filter true,$(BOARD_AVB_ENABLE)))

$(call end_json_map)

$(call end_json_map)





$(call add_json_bool, NextReleaseHideFlaggedApi, $(filter true,$(PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API)))

$(call add_json_bool, NextReleaseHideFlaggedApi, $(filter true,$(PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API)))

core/sysprop.mk

+1 −8
Original line number Original line Diff line number Diff line
@@ -186,15 +186,8 @@ BUILD_VERSION_TAGS := $(subst $(space),$(comma),$(sort $(BUILD_VERSION_TAGS))) 
# BUILD_FINGERPRINT is used used to uniquely identify the combined build and

# BUILD_FINGERPRINT is used used to uniquely identify the combined build and

# product; used by the OTA server.

# product; used by the OTA server.

ifeq (,$(strip $(BUILD_FINGERPRINT)))

ifeq (,$(strip $(BUILD_FINGERPRINT)))

  ifeq ($(strip $(HAS_BUILD_NUMBER)),false)

  BUILD_FINGERPRINT := $(PRODUCT_BRAND)/$(TARGET_PRODUCT)/$(TARGET_DEVICE):$(PLATFORM_VERSION)/$(BUILD_ID)/$(BUILD_NUMBER_FROM_FILE):$(TARGET_BUILD_VARIANT)/$(BUILD_VERSION_TAGS)

    BF_BUILD_NUMBER := $(BUILD_USERNAME)$$($(DATE_FROM_FILE) +%m%d%H%M)

  else

    BF_BUILD_NUMBER := $(BUILD_NUMBER_FROM_FILE)

  endif

  BUILD_FINGERPRINT := $(PRODUCT_BRAND)/$(TARGET_PRODUCT)/$(TARGET_DEVICE):$(PLATFORM_VERSION)/$(BUILD_ID)/$(BF_BUILD_NUMBER):$(TARGET_BUILD_VARIANT)/$(BUILD_VERSION_TAGS)

endif

endif

# unset it for safety.

BF_BUILD_NUMBER :=





BUILD_FINGERPRINT_FILE := $(PRODUCT_OUT)/build_fingerprint.txt

BUILD_FINGERPRINT_FILE := $(PRODUCT_OUT)/build_fingerprint.txt

ifneq (,$(shell mkdir -p $(PRODUCT_OUT) && echo $(BUILD_FINGERPRINT) >$(BUILD_FINGERPRINT_FILE) && grep " " $(BUILD_FINGERPRINT_FILE)))

ifneq (,$(shell mkdir -p $(PRODUCT_OUT) && echo $(BUILD_FINGERPRINT) >$(BUILD_FINGERPRINT_FILE) && grep " " $(BUILD_FINGERPRINT_FILE)))