diff options
| author | Anton Hansson <hansson@google.com> | 2018-11-13 15:04:41 +0000 |
|---|---|---|
| committer | Anton Hansson <hansson@google.com> | 2018-11-13 15:15:16 +0000 |
| commit | 95ae6cfcc4b40b566aa82dcf5fb12c05aa3ab4cf (patch) | |
| tree | fe775cb299331efa9870e7f0b78c9a13065d5a85 /cppreopts | |
| parent | 14a93639fd124abc8c100fb6f6c7a017236b05b1 (diff) | |
| download | extras-95ae6cfcc4b40b566aa82dcf5fb12c05aa3ab4cf.tar.gz | |
Make preloads_copy.sh a module
Make this new module required by cppreopts.sh. This allows removing
the duplicated PRODUCT_COPY_FILES directive for a bunch of devices
that import both.
Also fix some comments in the script.
Bug: 80508492
Test: lunch aosp_blueline-userdebug; m
Change-Id: I804fc17c43274683716a8c9bb3360ac624a80882
Diffstat (limited to 'cppreopts')
| -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" |