diff options
author | Anton Hansson <hansson@google.com> | 2018-11-14 08:59:46 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-11-14 08:59:46 +0000 |
commit | 5c6f273632c3d2090c4fb1361499d4f9f867e1ec (patch) | |
tree | 082c926c15f8c4c856a24390c4c3b87f715d91b9 | |
parent | 82f21a000d5e3d2c770ad544e18a0353d50a5aff (diff) | |
parent | 95ae6cfcc4b40b566aa82dcf5fb12c05aa3ab4cf (diff) | |
download | extras-android-o-mr1-iot-release-smart-clock-fcs.tar.gz |
Merge "Make preloads_copy.sh a module"android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcs
-rw-r--r-- | cppreopts/Android.mk | 12 | ||||
-rw-r--r-- | cppreopts/preloads_copy.sh | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/cppreopts/Android.mk b/cppreopts/Android.mk index 049f2b43..7d7f6232 100644 --- a/cppreopts/Android.mk +++ b/cppreopts/Android.mk @@ -14,14 +14,16 @@ LOCAL_PATH:= $(call my-dir) -# Create the cppreopts that does the copy include $(CLEAR_VARS) +LOCAL_MODULE := preloads_copy.sh +LOCAL_MODULE_CLASS := EXECUTABLES +LOCAL_SRC_FILES := preloads_copy.sh +include $(BUILD_PREBUILT) -LOCAL_MODULE:= cppreopts.sh +include $(CLEAR_VARS) +LOCAL_MODULE := cppreopts.sh LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_INIT_RC := cppreopts.rc LOCAL_SRC_FILES := cppreopts.sh - -LOCAL_REQUIRED_MODULES := preopt2cachename - +LOCAL_REQUIRED_MODULES := preopt2cachename preloads_copy.sh include $(BUILD_PREBUILT) diff --git a/cppreopts/preloads_copy.sh b/cppreopts/preloads_copy.sh index 7e5e8e4a..c65ebbe5 100644 --- a/cppreopts/preloads_copy.sh +++ b/cppreopts/preloads_copy.sh @@ -14,13 +14,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -# This script copies preloaded content from system_b to data partition +# This script copies preloaded content from system_other to data partition # create files with 644 (global read) permissions. umask 022 if [ $# -eq 1 ]; then - # Where the system_b is mounted that contains the preloads dir + # Where system_other is mounted that contains the preloads dir mountpoint=$1 dest_dir=/data/preloads log -p i -t preloads_copy "Copying from $mountpoint/preloads" |