openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Remove ro.expect.recovery_id" 

am: c683233b64

Change-Id: Ibabb8d69adf943370cb39b284e7704f3f8e22f2a
This commit is contained in:
Tom Cherry 2019-01-29 09:21:59 -08:00 committed by android-build-merger
parent 78d8e9c3da c683233b64
commit 2432b8116a
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/Makefile
View File

@ -474,9 +474,6 @@ endif
$(INSTALLED_BUILD_PROP_TARGET): $(intermediate_system_build_prop) $(INSTALLED_RECOVERYIMAGE_TARGET) $(INSTALLED_BUILD_PROP_TARGET): $(intermediate_system_build_prop) $(INSTALLED_RECOVERYIMAGE_TARGET)
@echo "Target build info: $@" @echo "Target build info: $@"
$(hide) grep -v 'ro.product.first_api_level' $(intermediate_system_build_prop) > $@ $(hide) grep -v 'ro.product.first_api_level' $(intermediate_system_build_prop) > $@
ifdef INSTALLED_RECOVERYIMAGE_TARGET
$(hide) echo ro.expect.recovery_id=`cat $(RECOVERYIMAGE_ID_FILE)` >> $@
endif
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# vendor build.prop # vendor build.prop

1
tools/releasetools/target_files_diff.py
View File

@ -71,7 +71,6 @@ def rewrite_build_property(original, new):
'ro.build.user=', 'ro.build.user=',
'ro.build.description=', 'ro.build.description=',
'ro.build.fingerprint=', 'ro.build.fingerprint=',
'ro.expect.recovery_id=',
'ro.vendor.build.date=', 'ro.vendor.build.date=',
'ro.vendor.build.date.utc=', 'ro.vendor.build.date.utc=',
'ro.vendor.build.fingerprint='] 'ro.vendor.build.fingerprint=']