Merge "Fix module-file name collisions" am: cdaa8466e0

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2201115

Change-Id: Ia8241cd01075aa1d3fdde7966bf9debfb46b7825
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

cmds/abx/Android.bp

@@ -1,4 +1,3 @@
-
 package {
     default_applicable_licenses: ["frameworks_base_cmds_abx_license"],
 }
@@ -18,7 +17,7 @@ license {
 
 java_binary {
     name: "abx",
-    wrapper: "abx",
+    wrapper: "abx.sh",
     srcs: ["**/*.java"],
     required: [
         "abx2xml",
@@ -28,10 +27,10 @@ java_binary {
 
 sh_binary {
     name: "abx2xml",
-    src: "abx2xml",
+    src: "abx2xml.sh",
 }
 
 sh_binary {
     name: "xml2abx",
-    src: "xml2abx",
+    src: "xml2abx.sh",
 }

cmds/bmgr/Android.bp

@@ -20,6 +20,6 @@ license {
 
 java_binary {
     name: "bmgr",
-    wrapper: "bmgr",
+    wrapper: "bmgr.sh",
     srcs: ["**/*.java"],
 }

cmds/bu/Android.bp

@@ -20,6 +20,6 @@ license {
 
 java_binary {
     name: "bu",
-    wrapper: "bu",
+    wrapper: "bu.sh",
     srcs: ["**/*.java"],
 }

cmds/content/Android.bp

@@ -19,6 +19,6 @@ license {
 
 java_binary {
     name: "content",
-    wrapper: "content",
+    wrapper: "content.sh",
     srcs: ["**/*.java"],
 }

cmds/device_config/Android.bp

@@ -14,5 +14,5 @@ package {
 
 sh_binary {
     name: "device_config",
-    src: "device_config",
+    src: "device_config.sh",
 }

cmds/dpm/Android.bp

@@ -20,5 +20,5 @@ license {
 
 sh_binary {
     name: "dpm",
-    src: "dpm",
+    src: "dpm.sh",
 }

cmds/hid/Android.bp

@@ -20,7 +20,7 @@ license {
 
 java_binary {
     name: "hid",
-    wrapper: "hid",
+    wrapper: "hid.sh",
     srcs: ["**/*.java"],
     required: ["libhidcommand_jni"],
 }

cmds/ime/Android.bp

@@ -20,5 +20,5 @@ license {
 
 sh_binary {
     name: "ime",
-    src: "ime",
+    src: "ime.sh",
 }

cmds/input/Android.bp

@@ -20,5 +20,5 @@ license {
 
 sh_binary {
     name: "input",
-    src: "input",
+    src: "input.sh",
 }

cmds/locksettings/Android.bp

@@ -23,6 +23,6 @@ package {
 
 java_binary {
     name: "locksettings",
-    wrapper: "locksettings",
+    wrapper: "locksettings.sh",
     srcs: ["**/*.java"],
 }

cmds/pm/Android.bp

@@ -20,5 +20,5 @@ license {
 
 sh_binary {
     name: "pm",
-    src: "pm",
+    src: "pm.sh",
 }

cmds/requestsync/Android.bp

@@ -20,6 +20,6 @@ license {
 
 java_binary {
     name: "requestsync",
-    wrapper: "requestsync",
+    wrapper: "requestsync.sh",
     srcs: ["**/*.java"],
 }

cmds/settings/Android.bp

@@ -14,5 +14,5 @@ package {
 
 sh_binary {
     name: "settings",
-    src: "settings",
+    src: "settings.sh",
 }

cmds/sm/Android.bp

@@ -20,6 +20,6 @@ license {
 
 java_binary {
     name: "sm",
-    wrapper: "sm",
+    wrapper: "sm.sh",
     srcs: ["**/*.java"],
 }

cmds/svc/Android.bp

@@ -20,6 +20,6 @@ license {
 
 java_binary {
     name: "svc",
-    wrapper: "svc",
+    wrapper: "svc.sh",
     srcs: ["**/*.java"],
 }

cmds/telecom/Android.bp

@@ -20,6 +20,6 @@ license {
 
 java_binary {
     name: "telecom",
-    wrapper: "telecom",
+    wrapper: "telecom.sh",
     srcs: ["**/*.java"],
 }

cmds/uiautomator/cmds/uiautomator/Android.bp

@@ -25,7 +25,7 @@ package {
 
 java_binary {
     name: "uiautomator",
-    wrapper: "uiautomator",
+    wrapper: "uiautomator.sh",
     srcs: ["src/**/*.java"],
     static_libs: ["uiautomator.core"],
 }

cmds/uinput/Android.bp

@@ -20,9 +20,10 @@ license {
 
 java_binary {
     name: "uinput",
-    wrapper: "uinput",
+    wrapper: "uinput.sh",
-    srcs: ["**/*.java",
+    srcs: [
-           ":uinputcommand_aidl"
+        "**/*.java",
+        ":uinputcommand_aidl",
     ],
     required: ["libuinputcommand_jni"],
 }

cmds/vr/Android.bp

@@ -20,6 +20,6 @@ license {
 
 java_binary {
     name: "vr",
-    wrapper: "vr",
+    wrapper: "vr.sh",
     srcs: ["**/*.java"],
 }

cmds/wm/Android.bp

@@ -20,5 +20,5 @@ license {
 
 sh_binary {
     name: "wm",
-    src: "wm",
+    src: "wm.sh",
 }