diff options
| author | Tao Bao <tbao@google.com> | 2019-06-24 17:57:34 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-24 17:57:34 +0200 |
| commit | b50f8553963b023558911262252c14d9fe7550e0 (patch) | |
| tree | 9eb79938a425e9fac11a4c4f460c0625c097da74 | |
| parent | Merge "Support starting fuse from a block map" (diff) | |
| parent | Merge "updater_sample: Build SystemUpdaterSample as non-privileged app by default." (diff) | |
| download | android_bootable_recovery-b50f8553963b023558911262252c14d9fe7550e0.tar android_bootable_recovery-b50f8553963b023558911262252c14d9fe7550e0.tar.gz android_bootable_recovery-b50f8553963b023558911262252c14d9fe7550e0.tar.bz2 android_bootable_recovery-b50f8553963b023558911262252c14d9fe7550e0.tar.lz android_bootable_recovery-b50f8553963b023558911262252c14d9fe7550e0.tar.xz android_bootable_recovery-b50f8553963b023558911262252c14d9fe7550e0.tar.zst android_bootable_recovery-b50f8553963b023558911262252c14d9fe7550e0.zip | |
| -rw-r--r-- | CleanSpec.mk | 3 | ||||
| -rw-r--r-- | updater_sample/Android.bp | 1 | ||||
| -rw-r--r-- | updater_sample/README.md | 6 |
3 files changed, 7 insertions, 3 deletions
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 # ************************************************ diff --git a/updater_sample/Android.bp b/updater_sample/Android.bp index 845e07b70..a014248b0 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"], diff --git a/updater_sample/README.md b/updater_sample/README.md index 2070ebc21..2e12a2fb9 100644 --- a/updater_sample/README.md +++ b/updater_sample/README.md @@ -191,6 +191,8 @@ privileged system app, so it's granted the required permissions to access </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 @@ The commands are expected to be run from `$ANDROID_BUILD_TOP`. 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 |