Merge "Rename the dir for SystemUpdaterSample."

Android.mk

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

PREUPLOAD.cfg

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

updater_sample/README.md

@@ -13,7 +13,7 @@ targets the latest android.
 
 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>`.
 3. Add update config files.
 
@@ -45,7 +45,7 @@ is located at `res/raw/sample.json`.
 
 ## Running tests
 
-1. Build `$ mmma bootable/recovery/sample_updater/`
+1. Build `$ mmma bootable/recovery/updater_sample/`
 2. Install app
    `$ adb install $OUT/system/app/SystemUpdaterSample/SystemUpdaterSample.apk`
 3. Install tests

updater_sample/tests/AndroidManifest.xml

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