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

Commit 75635a16 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am aec004e6: resolved conflicts for merge of 1a856098 to lmp-mr1-dev 

* commit 'aec004e6':
  Export build thumbprint only if the product has specified at least one oem fingerprint property
parents 9dd0da24 aec004e6

core/Makefile

+10 −5
Original line number Diff line number Diff line
@@ -133,6 +133,13 @@ ifneq ($(words $(BUILD_THUMBPRINT)),1) 
  $(error BUILD_THUMBPRINT cannot contain spaces: "$(BUILD_THUMBPRINT)")

endif



KNOWN_OEM_THUMBPRINT_PROPERTIES := \

    ro.product.brand \

    ro.product.name \

    ro.product.device

OEM_THUMBPRINT_PROPERTIES := $(filter $(KNOWN_OEM_THUMBPRINT_PROPERTIES),\

    $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_OEM_PROPERTIES))



# Display parameters shown under Settings -> About Phone

ifeq ($(TARGET_BUILD_VARIANT),user)

  # User builds should show:
@@ -212,7 +219,7 @@ endif 
			BUILD_VERSION_TAGS="$(BUILD_VERSION_TAGS)" \

			TARGET_BOOTLOADER_BOARD_NAME="$(TARGET_BOOTLOADER_BOARD_NAME)" \

			BUILD_FINGERPRINT="$(BUILD_FINGERPRINT)" \

			BUILD_THUMBPRINT="$(BUILD_THUMBPRINT)" \

			$(if $(OEM_THUMBPRINT_PROPERTIES),BUILD_THUMBPRINT="$(BUILD_THUMBPRINT)") \

			TARGET_BOARD_PLATFORM="$(TARGET_BOARD_PLATFORM)" \

			TARGET_CPU_ABI_LIST="$(TARGET_CPU_ABI_LIST)" \

			TARGET_CPU_ABI_LIST_32_BIT="$(TARGET_CPU_ABI_LIST_32_BIT)" \
@@ -1399,11 +1406,9 @@ endif 
	$(hide) echo "multistage_support=1" >> $(zip_root)/META/misc_info.txt

	$(hide) echo "update_rename_support=1" >> $(zip_root)/META/misc_info.txt

	$(hide) echo "blockimgdiff_versions=1,2" >> $(zip_root)/META/misc_info.txt

ifneq ($(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_OEM_PROPERTIES),)

ifneq ($(OEM_THUMBPRINT_PROPERTIES),)

	# OTA scripts are only interested in fingerprint related properties

ifneq ($(filter ro.product.brand ro.product.name ro.product.device, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_OEM_PROPERTIES)),)

	$(hide) echo "oem_fingerprint_properties=$(filter ro.product.brand ro.product.name ro.product.device, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_OEM_PROPERTIES))" >> $(zip_root)/META/misc_info.txt

endif

	$(hide) echo "oem_fingerprint_properties=$(OEM_THUMBPRINT_PROPERTIES)" >> $(zip_root)/META/misc_info.txt

endif

	$(call generate-userimage-prop-dictionary, $(zip_root)/META/misc_info.txt)

	$(hide) ./build/tools/releasetools/make_recovery_patch $(zip_root) $(zip_root)

tools/buildinfo.sh

+3 −1
Original line number Diff line number Diff line
@@ -50,7 +50,9 @@ echo "ro.build.product=$TARGET_DEVICE" 
echo "# Do not try to parse description, fingerprint, or thumbprint"

echo "ro.build.description=$PRIVATE_BUILD_DESC"

echo "ro.build.fingerprint=$BUILD_FINGERPRINT"

if [ -n "$BUILD_THUMBPRINT" ] ; then

  echo "ro.build.thumbprint=$BUILD_THUMBPRINT"

fi

echo "ro.build.characteristics=$TARGET_AAPT_CHARACTERISTICS"



echo "# end build properties"