diff options
| author | Anton Hansson <hansson@google.com> | 2018-11-14 01:33:51 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-11-14 01:33:51 -0800 |
| commit | e9f3458a67cdea2020048e7fed7ccb7561edd41c (patch) | |
| tree | f8ce1937a02a325892ecfe0f9d9e8d19fa5723d5 | |
| parent | bb1ac7d2ee9ad8342889aa2195ec32591b482897 (diff) | |
| parent | fc528c41cd4dc677c29ede7ea41819a06c18fddc (diff) | |
| download | extras-e9f3458a67cdea2020048e7fed7ccb7561edd41c.tar.gz | |
Merge "Make preloads_copy.sh a module" am: 5c6f273632 am: a2c3beab14
am: fc528c41cd
Change-Id: If8d1c8b45c260cc579be8b33b20f0c9bffa0cc9d
| -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" |