Merge "Rename the dir for SystemUpdaterSample."

am: a544bfab2b

Change-Id: If6329a0f9a7732b99d11f6233ed56f72db31ac96
This commit is contained in:
android-build-prod (mdb) 2018-04-25 17:22:22 -07:00 committed by android-build-merger
commit 4b52553cbb
27 changed files with 5 additions and 5 deletions

View file

@ -199,7 +199,7 @@ include $(BUILD_EXECUTABLE)
include \ include \
$(LOCAL_PATH)/boot_control/Android.mk \ $(LOCAL_PATH)/boot_control/Android.mk \
$(LOCAL_PATH)/minui/Android.mk \ $(LOCAL_PATH)/minui/Android.mk \
$(LOCAL_PATH)/sample_updater/Android.mk \
$(LOCAL_PATH)/tests/Android.mk \ $(LOCAL_PATH)/tests/Android.mk \
$(LOCAL_PATH)/tools/Android.mk \ $(LOCAL_PATH)/tools/Android.mk \
$(LOCAL_PATH)/updater/Android.mk \ $(LOCAL_PATH)/updater/Android.mk \
$(LOCAL_PATH)/updater_sample/Android.mk \

View file

@ -7,5 +7,5 @@ clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp
[Hook Scripts] [Hook Scripts]
checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT} checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}
-fw sample_updater/ -fw updater_sample/

View file

@ -13,7 +13,7 @@ targets the latest android.
The commands expected to be run from `$ANDROID_BUILD_TOP`. The commands expected to be run from `$ANDROID_BUILD_TOP`.
1. Compile the app `$ mmma bootable/recovery/sample_updater`. 1. Compile the app `$ mmma bootable/recovery/updater_sample`.
2. Install the app to the device using `$ adb install <APK_PATH>`. 2. Install the app to the device using `$ adb install <APK_PATH>`.
3. Add update config files. 3. Add update config files.
@ -45,7 +45,7 @@ is located at `res/raw/sample.json`.
## Running tests ## Running tests
1. Build `$ mmma bootable/recovery/sample_updater/` 1. Build `$ mmma bootable/recovery/updater_sample/`
2. Install app 2. Install app
`$ adb install $OUT/system/app/SystemUpdaterSample/SystemUpdaterSample.apk` `$ adb install $OUT/system/app/SystemUpdaterSample/SystemUpdaterSample.apk`
3. Install tests 3. Install tests

View file

Before

Width:  |  Height:  |  Size: 3 KiB

After

Width:  |  Height:  |  Size: 3 KiB

View file

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

View file

@ -26,6 +26,6 @@
<instrumentation android:name="android.support.test.runner.AndroidJUnitRunner" <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
android:targetPackage="com.example.android.systemupdatersample" android:targetPackage="com.example.android.systemupdatersample"
android:label="Tests for SampleUpdater."/> android:label="Tests for SystemUpdaterSample."/>
</manifest> </manifest>