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

Commit 5b6e2ba9 authored by Edward Wang's avatar Edward Wang
Browse files

build: skip 'ro.product.device' using new macro "TARGET_SKIP_PRODUCT_DEVICE" 

Change-Id: Id17ef7de8b0146dd6e4b2cc3cc5b88453da38f6c
Ticket: FEIJ-62
parent fea1cb95

core/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -249,6 +249,7 @@ endif 
			TARGET_AAPT_CHARACTERISTICS="$(TARGET_AAPT_CHARACTERISTICS)" \

			TARGET_UNIFIED_DEVICE="$(TARGET_UNIFIED_DEVICE)" \

			TARGET_SKIP_DEFAULT_LOCALE="$(TARGET_SKIP_DEFAULT_LOCALE)" \

			TARGET_SKIP_PRODUCT_DEVICE="$(TARGET_SKIP_PRODUCT_DEVICE)" \

			$(PRODUCT_BUILD_PROP_OVERRIDES) \

	        bash $(BUILDINFO_SH) >> $@

	$(hide) $(foreach file,$(system_prop_file), \

core/product.mk

+1 −0
Original line number Diff line number Diff line
@@ -329,6 +329,7 @@ _product_stash_var_list += \ 


_product_stash_var_list += \

	TARGET_SKIP_DEFAULT_LOCALE \

	TARGET_SKIP_PRODUCT_DEVICE \



#

# Stash values of the variables in _product_stash_var_list.

tools/buildinfo.sh

+3 −1
Original line number Diff line number Diff line
@@ -46,7 +46,9 @@ echo "ro.board.platform=$TARGET_BOARD_PLATFORM" 
if [ "$TARGET_UNIFIED_DEVICE" == "" ] ; then

  echo "# ro.build.product is obsolete; use ro.product.device"

  echo "ro.build.product=$TARGET_DEVICE"

  if [ -z "$TARGET_SKIP_PRODUCT_DEVICE" ] ; then

    echo "ro.product.model=$PRODUCT_MODEL"

  fi

  echo "ro.product.device=$TARGET_DEVICE"

  echo "# Do not try to parse description, fingerprint, or thumbprint"

  echo "ro.build.description=$PRIVATE_BUILD_DESC"