diff options
| author | 2022-09-02 05:31:13 +0000 | |
|---|---|---|
| committer | 2022-09-02 05:31:13 +0000 | |
| commit | 0bb48ec2749edc12b017f1d2984719144cfb74ce (patch) | |
| tree | d6ad2fbd27c93c7b4c75dfb6731c8c9351ffeb36 /cmds | |
| parent | 8adb4a5c5cc94a3305245fd0d7ecf18e7453f326 (diff) | |
| parent | 645e261b332a9b11969208c3e6a57f6ca26cfda7 (diff) | |
Merge "Fix module-file name collisions" am: 92f4e14b94 am: b88cb3e1ce am: 1d4139e72d am: 645e261b33
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2202594
Change-Id: If10153a1ccd76dc65295db1e73419dbcd5276350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/am/Android.bp | 2 | ||||
| -rwxr-xr-x | cmds/am/am.sh (renamed from cmds/am/am) | 0 | ||||
| -rw-r--r-- | cmds/appops/Android.bp | 2 | ||||
| -rwxr-xr-x | cmds/appops/appops.sh (renamed from cmds/appops/appops) | 0 | ||||
| -rw-r--r-- | cmds/appwidget/Android.bp | 2 | ||||
| -rwxr-xr-x | cmds/appwidget/appwidget.sh (renamed from cmds/appwidget/appwidget) | 0 |
6 files changed, 3 insertions, 3 deletions
diff --git a/cmds/am/Android.bp b/cmds/am/Android.bp index 7bb9675ede37..c6cc7c55dae3 100644 --- a/cmds/am/Android.bp +++ b/cmds/am/Android.bp @@ -30,7 +30,7 @@ cc_library_host_static { java_binary { name: "am", - wrapper: "am", + wrapper: "am.sh", srcs: [ "src/**/*.java", "proto/**/*.proto", diff --git a/cmds/am/am b/cmds/am/am.sh index 54c2d394be2c..54c2d394be2c 100755 --- a/cmds/am/am +++ b/cmds/am/am.sh diff --git a/cmds/appops/Android.bp b/cmds/appops/Android.bp index 80f8ec679247..538ae941548e 100644 --- a/cmds/appops/Android.bp +++ b/cmds/appops/Android.bp @@ -19,5 +19,5 @@ license { sh_binary { name: "appops", - src: "appops", + src: "appops.sh", } diff --git a/cmds/appops/appops b/cmds/appops/appops.sh index 5dc85aa0979c..5dc85aa0979c 100755 --- a/cmds/appops/appops +++ b/cmds/appops/appops.sh diff --git a/cmds/appwidget/Android.bp b/cmds/appwidget/Android.bp index 8049038de809..cd439e2753e9 100644 --- a/cmds/appwidget/Android.bp +++ b/cmds/appwidget/Android.bp @@ -19,6 +19,6 @@ license { java_binary { name: "appwidget", - wrapper: "appwidget", + wrapper: "appwidget.sh", srcs: ["**/*.java"], } diff --git a/cmds/appwidget/appwidget b/cmds/appwidget/appwidget.sh index cc70ca53d5dd..cc70ca53d5dd 100755 --- a/cmds/appwidget/appwidget +++ b/cmds/appwidget/appwidget.sh |