diff options
| author | Edward Wang <ewang@cyngn.com> | 2016-04-15 23:03:14 -0700 |
|---|---|---|
| committer | Edward Wang <ewang@cyngn.com> | 2016-04-15 23:05:45 -0700 |
| commit | 06a72275fb859eaffd879c22f86b87a0e3f36e87 (patch) | |
| tree | 0f66c82a42f4657151468d44f95dbbd14058e201 | |
| parent | c9c78dbd214d3ca9e79788c3406a40cb80638dcb (diff) | |
| download | build-06a72275fb859eaffd879c22f86b87a0e3f36e87.zip build-06a72275fb859eaffd879c22f86b87a0e3f36e87.tar.gz build-06a72275fb859eaffd879c22f86b87a0e3f36e87.tar.bz2 | |
build: skip 'ro.product.device' using new macro "TARGET_SKIP_PRODUCT_DEVICE"
Change-Id: Id17ef7de8b0146dd6e4b2cc3cc5b88453da38f6c
Ticket: FEIJ-62
| -rw-r--r-- | core/Makefile | 1 | ||||
| -rw-r--r-- | core/product.mk | 1 | ||||
| -rwxr-xr-x | tools/buildinfo.sh | 4 |
3 files changed, 5 insertions, 1 deletions
diff --git a/core/Makefile b/core/Makefile index 1146f13..3ac9b0d 100644 --- a/core/Makefile +++ b/core/Makefile @@ -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), \ diff --git a/core/product.mk b/core/product.mk index b9cb556..cced554 100644 --- a/core/product.mk +++ b/core/product.mk @@ -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. diff --git a/tools/buildinfo.sh b/tools/buildinfo.sh index c621859..fa717b7 100755 --- a/tools/buildinfo.sh +++ b/tools/buildinfo.sh @@ -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" - echo "ro.product.model=$PRODUCT_MODEL" + 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" |