From 27eba54b20e1f1d597a979be1469b62dd262aecb Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Thu, 4 Dec 2014 15:19:08 -0800 Subject: [PATCH] Add system propery ro.build.flavor. ro.build.flavor is set to "$(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT)" in system.img build.prop at build time, and it won't be overridden by oem partition's build.prop. Bug: 18605832 Change-Id: Ic917623dd43b74d9c601119db0b457483e8c4472 --- core/Makefile | 1 + tools/buildinfo.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/core/Makefile b/core/Makefile index eb3b1c3478..15c7f02a6e 100644 --- a/core/Makefile +++ b/core/Makefile @@ -200,6 +200,7 @@ ifneq ($(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_OEM_PROPERTIES),) echo "import /oem/oem.prop $(prop)" >> $@;) endif $(hide) TARGET_BUILD_TYPE="$(TARGET_BUILD_VARIANT)" \ + TARGET_BUILD_FLAVOR="$(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT)" \ TARGET_DEVICE="$(TARGET_DEVICE)" \ PRODUCT_NAME="$(TARGET_PRODUCT)" \ PRODUCT_BRAND="$(PRODUCT_BRAND)" \ diff --git a/tools/buildinfo.sh b/tools/buildinfo.sh index ed6bd87ed2..a80b2db47a 100755 --- a/tools/buildinfo.sh +++ b/tools/buildinfo.sh @@ -16,6 +16,7 @@ echo "ro.build.type=$TARGET_BUILD_TYPE" echo "ro.build.user=$USER" echo "ro.build.host=`hostname`" echo "ro.build.tags=$BUILD_VERSION_TAGS" +echo "ro.build.flavor=$TARGET_BUILD_FLAVOR" echo "ro.product.model=$PRODUCT_MODEL" echo "ro.product.brand=$PRODUCT_BRAND" echo "ro.product.name=$PRODUCT_NAME"