From 061267eee9ccf8e17ce1ab81e4f0845a5a49ae45 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Fri, 21 Jun 2019 11:16:45 -0700 Subject: updater_sample: Build SystemUpdaterSample as non-privileged app by default. Prior to the change, SystemUpdaterSample was built as privileged app. It must be installed along with the matching privapp-permissions whitelist change (as noted in updater_sample/README.md), otherwise would block device booting if installed unintentionally (e.g. with `mm` or `mmma`). This CL avoids putting the device in a bad state due to a sample app. Fixes: 135703777 Test: `lunch aosp_taimen-userdebug && m -j installclean && mmma -j bootable/recovery && m -j` Flash on device and boot successfully. Test: Run the tests per instructions in updater_sample/README.md. Change-Id: Ib8b587c77570f05f7db748fad84744fa45016aab --- CleanSpec.mk | 3 +++ 1 file changed, 3 insertions(+) (limited to 'CleanSpec.mk') diff --git a/CleanSpec.mk b/CleanSpec.mk index 6bd1eb170..8405d20e1 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -55,6 +55,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/nativetest/recovery_component_ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/nativetest64/recovery_component_test) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/testcases/recovery_component_test) +$(call add-clean-step, find $(OUT_DIR) -type f -name "SystemUpdaterSample*" -print0 | xargs -0 rm -f) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/SystemUpdaterSample) + # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ -- cgit v1.2.3