diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-06-21 20:30:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-21 20:30:42 +0000 |
| commit | 5afa60caa737ec4b6210a409873e75ecb8eca22e (patch) | |
| tree | 5933efe25ad3a2ec4c415eeb73e4f0f87c0361b4 | |
| parent | 4bdcab99ff5d28049d44cd73dc5b8ba90a403993 (diff) | |
| parent | cd2558526cbf58fc219d6aca6bf25b1b2b41a194 (diff) | |
| download | external_updater-5afa60caa737ec4b6210a409873e75ecb8eca22e.tar.gz | |
Merge "Support copying extra cargo2android* files" am: a6543fe948 am: 673d33b5dc am: 21efc9ee43 am: cd2558526c
Original change: https://android-review.googlesource.com/c/platform/tools/external_updater/+/1733442
Change-Id: I7877c24dd5e044280041c7e4cbce7107922ed603
| -rw-r--r-- | update_package.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/update_package.sh b/update_package.sh index 59a0357..d29f7c5 100644 --- a/update_package.sh +++ b/update_package.sh @@ -46,7 +46,9 @@ CopyIfPresent "METADATA" CopyIfPresent "TEST_MAPPING" CopyIfPresent ".git" CopyIfPresent ".gitignore" -CopyIfPresent "cargo2android.json" +if compgen -G "$external_dir/cargo2android*"; then + cp -a -f -n $external_dir/cargo2android* . +fi CopyIfPresent "patches" CopyIfPresent "post_update.sh" CopyIfPresent "OWNERS" |