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

Commit b0af9fad authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make ro.product.cpu.abilist.* to be fetched dynamically" am: d041e4ba 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic8b7b2fae228654223998695100bb1b48978bb29
parents 024af725 d041e4ba

core/main.mk

+0 −8
Original line number Diff line number Diff line
@@ -285,9 +285,6 @@ endif 


ADDITIONAL_VENDOR_PROPERTIES += \

    ro.vendor.build.security_patch=$(VENDOR_SECURITY_PATCH) \

    ro.vendor.product.cpu.abilist=$(TARGET_CPU_ABI_LIST) \

    ro.vendor.product.cpu.abilist32=$(TARGET_CPU_ABI_LIST_32_BIT) \

    ro.vendor.product.cpu.abilist64=$(TARGET_CPU_ABI_LIST_64_BIT) \

    ro.product.board=$(TARGET_BOOTLOADER_BOARD_NAME) \

    ro.board.platform=$(TARGET_BOARD_PLATFORM) \

    ro.hwui.use_vulkan=$(TARGET_USES_VULKAN)
@@ -302,11 +299,6 @@ ADDITIONAL_VENDOR_PROPERTIES += \ 
    ro.build.ab_update=$(AB_OTA_UPDATER)

endif



ADDITIONAL_ODM_PROPERTIES += \

    ro.odm.product.cpu.abilist=$(TARGET_CPU_ABI_LIST) \

    ro.odm.product.cpu.abilist32=$(TARGET_CPU_ABI_LIST_32_BIT) \

    ro.odm.product.cpu.abilist64=$(TARGET_CPU_ABI_LIST_64_BIT)



# Set ro.product.vndk.version to know the VNDK version required by product

# modules. It uses the version in PRODUCT_PRODUCT_VNDK_VERSION. If the value

# is "current", use PLATFORM_VNDK_VERSION.

core/sysprop.mk

+5 −0
Original line number Diff line number Diff line
@@ -47,6 +47,11 @@ define generate-common-build-props 
        echo "ro.product.$(1).model=$(PRODUCT_MODEL)" >> $(2);\

        echo "ro.product.$(1).name=$(TARGET_PRODUCT)" >> $(2);\

    )\

    $(if $(filter system vendor odm,$(1)),\

        echo "ro.$(1).product.cpu.abilist=$(TARGET_CPU_ABI_LIST) " >> $(2);\

        echo "ro.$(1).product.cpu.abilist32=$(TARGET_CPU_ABI_LIST_32_BIT)" >> $(2);\

        echo "ro.$(1).product.cpu.abilist64=$(TARGET_CPU_ABI_LIST_64_BIT)" >> $(2);\

    )\

    echo "ro.$(1).build.date=`$(DATE_FROM_FILE)`" >> $(2);\

    echo "ro.$(1).build.date.utc=`$(DATE_FROM_FILE) +%s`" >> $(2);\

    echo "ro.$(1).build.fingerprint=$(BUILD_FINGERPRINT_FROM_FILE)" >> $(2);\

tools/buildinfo.sh

+0 −3
Original line number Diff line number Diff line
@@ -35,9 +35,6 @@ echo "ro.product.cpu.abi=$TARGET_CPU_ABI" 
if [ -n "$TARGET_CPU_ABI2" ] ; then

  echo "ro.product.cpu.abi2=$TARGET_CPU_ABI2"

fi

echo "ro.product.cpu.abilist=$TARGET_CPU_ABI_LIST"

echo "ro.product.cpu.abilist32=$TARGET_CPU_ABI_LIST_32_BIT"

echo "ro.product.cpu.abilist64=$TARGET_CPU_ABI_LIST_64_BIT"



if [ -n "$PRODUCT_DEFAULT_LOCALE" ] ; then

  echo "ro.product.locale=$PRODUCT_DEFAULT_LOCALE"