commit b87520077be3a20c3483055bab4f43c57ada93ce
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jun 24 15:41:27 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 24 15:41:27 2019 +0000
tree 9eb79938a425e9fac11a4c4f460c0625c097da74
parent 090b62832f1e4507a864373b3e393aaa021a1f12
parent 061267eee9ccf8e17ce1ab81e4f0845a5a49ae45

Merge "updater_sample: Build SystemUpdaterSample as non-privileged app by default."

CleanSpec.mk

diff --git a/CleanSpec.mk b/CleanSpec.mk
index 6bd1eb1..8405d20 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -55,6 +55,9 @@
 $(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
 # ************************************************

updater_sample/Android.bp

diff --git a/updater_sample/Android.bp b/updater_sample/Android.bp
index 845e07b..a014248 100644
--- a/updater_sample/Android.bp
+++ b/updater_sample/Android.bp
@@ -15,7 +15,6 @@
 android_app {
     name: "SystemUpdaterSample",
     sdk_version: "system_current",
-    privileged: true,
 
     srcs: ["src/**/*.java"],
 

updater_sample/README.md

diff --git a/updater_sample/README.md b/updater_sample/README.md
index 2070ebc..2e12a2f 100644
--- a/updater_sample/README.md
+++ b/updater_sample/README.md
@@ -191,6 +191,8 @@
     </privapp-permissions>
    ```
    to `frameworks/base/data/etc/privapp-permissions-platform.xml`
+4. Add `privileged: true` to SystemUpdaterSample
+   [building rule](https://android.googlesource.com/platform/bootable/recovery/+/refs/heads/master/updater_sample/Android.bp).
 5. Build sample app `make -j SystemUpdaterSample`.
 6. Build Android `make -j`
 7. [Flash the device](https://source.android.com/setup/build/running)
@@ -229,9 +231,9 @@
 
 1. Build `make -j SystemUpdaterSample` and `make -j SystemUpdaterSampleTests`.
 2. Install app
-   `adb install $OUT/system/priv-app/SystemUpdaterSample/SystemUpdaterSample.apk`
+   `adb install $OUT/system/app/SystemUpdaterSample/SystemUpdaterSample.apk`
 3. Install tests
-   `adb install $OUT/testcases/SystemUpdaterSampleTests/SystemUpdaterSampleTests.apk`
+   `adb install $OUT/testcases/SystemUpdaterSampleTests/arm64/SystemUpdaterSampleTests.apk`
 4. Run tests
    `adb shell am instrument -w com.example.android.systemupdatersample.tests/android.support.test.runner.AndroidJUnitRunner`
 5. Run a test file