commit d81af0d11ba78be8c12aad17a42c1a2c0d7ad87f
author Tom Cherry <tomcherry@google.com> Tue Jan 29 09:27:09 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Jan 29 09:27:09 2019 -0800
tree 062a93fe41a41ab653162d9b1303188f318a11c2
parent 756590ca12d2fad4a8ae0cd0ecc0c113d3c2dc54
parent 2432b8116ad69e8540a43a0a0aa38026fe46e3cc

Merge "Remove ro.expect.recovery_id" am: c683233b64
am: 2432b8116a

Change-Id: I42316425c3466278ff22b2e687c6fa45980cece1

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 9d37de8..ad9b452 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -474,9 +474,6 @@
 $(INSTALLED_BUILD_PROP_TARGET): $(intermediate_system_build_prop) $(INSTALLED_RECOVERYIMAGE_TARGET)
 	@echo "Target build info: $@"
 	$(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

tools/releasetools/target_files_diff.py

diff --git a/tools/releasetools/target_files_diff.py b/tools/releasetools/target_files_diff.py
index 7415f27..4402c8d 100755
--- a/tools/releasetools/target_files_diff.py
+++ b/tools/releasetools/target_files_diff.py
@@ -71,7 +71,6 @@
              'ro.build.user=',
              'ro.build.description=',
              'ro.build.fingerprint=',
-             'ro.expect.recovery_id=',
              'ro.vendor.build.date=',
              'ro.vendor.build.date.utc=',
              'ro.vendor.build.fingerprint=']