From 7b6acb3f2dd1bf677e7a47a4b54568d084f0ed2a Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Mon, 5 Sep 2022 17:56:28 -0700 Subject: [PATCH] Fix module-file name collisions Bazel doesn't allow a module and file with the same name. Bug: 198619163 Test: Presubmits Change-Id: I828de4265a247c93e778764d0ece54d4d1760daa --- soundtrigger/2.3/cli/Android.bp | 2 +- soundtrigger/2.3/cli/{sthal_cli_2.3 => sthal_cli_2.3.sh} | 0 soundtrigger/aidl/cli/Android.bp | 2 +- soundtrigger/aidl/cli/{sthal_cli_3 => sthal_cli_3.sh} | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename soundtrigger/2.3/cli/{sthal_cli_2.3 => sthal_cli_2.3.sh} (100%) rename soundtrigger/aidl/cli/{sthal_cli_3 => sthal_cli_3.sh} (100%) diff --git a/soundtrigger/2.3/cli/Android.bp b/soundtrigger/2.3/cli/Android.bp index 27d7b301eb..883bf2b7c7 100644 --- a/soundtrigger/2.3/cli/Android.bp +++ b/soundtrigger/2.3/cli/Android.bp @@ -9,7 +9,7 @@ package { java_binary { name: "sthal_cli_2.3", - wrapper: "sthal_cli_2.3", + wrapper: "sthal_cli_2.3.sh", srcs: ["java/**/*.java"], static_libs: [ "android.hardware.soundtrigger-V2.3-java", diff --git a/soundtrigger/2.3/cli/sthal_cli_2.3 b/soundtrigger/2.3/cli/sthal_cli_2.3.sh similarity index 100% rename from soundtrigger/2.3/cli/sthal_cli_2.3 rename to soundtrigger/2.3/cli/sthal_cli_2.3.sh diff --git a/soundtrigger/aidl/cli/Android.bp b/soundtrigger/aidl/cli/Android.bp index e8999ff6b1..935e438c3d 100644 --- a/soundtrigger/aidl/cli/Android.bp +++ b/soundtrigger/aidl/cli/Android.bp @@ -9,7 +9,7 @@ package { java_binary { name: "sthal_cli_3", - wrapper: "sthal_cli_3", + wrapper: "sthal_cli_3.sh", srcs: ["java/**/*.java"], static_libs: [ "android.hardware.soundtrigger3-V1-java", diff --git a/soundtrigger/aidl/cli/sthal_cli_3 b/soundtrigger/aidl/cli/sthal_cli_3.sh similarity index 100% rename from soundtrigger/aidl/cli/sthal_cli_3 rename to soundtrigger/aidl/cli/sthal_cli_3.sh