From 5c59fcd996d3decae578f2831b7b2dcefee48ba7 Mon Sep 17 00:00:00 2001
From: Cole Faust <colefaust@google.com>
Date: Thu, 1 Sep 2022 15:58:20 -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: Ie6a8f5153086ce7d645bf56f02def446dbb4dee5
Merged-In: I95218c593ee614234d60f1d411332a398416923a
---
 fingerprint/extension/Android.bp                    | 2 +-
 fingerprint/extension/fingerprint.extension.mk      | 2 +-
 fingerprint/extension/init.fingerprint.extension.rc | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/fingerprint/extension/Android.bp b/fingerprint/extension/Android.bp
index fa2f13e3..f36f3d5d 100644
--- a/fingerprint/extension/Android.bp
+++ b/fingerprint/extension/Android.bp
@@ -8,7 +8,7 @@ package {
 }
 
 sh_binary {
-    name: "fingerprint.extension.sh",
+    name: "fingerprint.extension",
     init_rc: ["init.fingerprint.extension.rc"],
     src: "fingerprint.extension.sh",
     system_ext_specific: true,
diff --git a/fingerprint/extension/fingerprint.extension.mk b/fingerprint/extension/fingerprint.extension.mk
index 96657d14..1b8270aa 100644
--- a/fingerprint/extension/fingerprint.extension.mk
+++ b/fingerprint/extension/fingerprint.extension.mk
@@ -6,5 +6,5 @@ SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/fingerprint-ex
 SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += hardware/google/pixel-sepolicy/fingerprint-extension/system_ext/private/
 PRODUCT_PACKAGES += \
     fps_ext_bug_lib \
-    fingerprint.extension.sh
+    fingerprint.extension
 endif
diff --git a/fingerprint/extension/init.fingerprint.extension.rc b/fingerprint/extension/init.fingerprint.extension.rc
index 9277ce09..70bcfd2f 100644
--- a/fingerprint/extension/init.fingerprint.extension.rc
+++ b/fingerprint/extension/init.fingerprint.extension.rc
@@ -1,18 +1,18 @@
 # init-fingerprint-extension-sh is to send intent command to app
 # for tracking fingerprint issue.
-service fingerprint-extension-bug-latency /system_ext/bin/fingerprint.extension.sh latency
+service fingerprint-extension-bug-latency /system_ext/bin/fingerprint.extension latency
     group shell
     user shell
     disabled
     oneshot
 
-service fingerprint-extension-bug-lockout /system_ext/bin/fingerprint.extension.sh lockout
+service fingerprint-extension-bug-lockout /system_ext/bin/fingerprint.extension lockout
     group shell
     user shell
     disabled
     oneshot
 
-service fingerprint-extension-bug-auth /system_ext/bin/fingerprint.extension.sh auth
+service fingerprint-extension-bug-auth /system_ext/bin/fingerprint.extension auth
     group shell
     user shell
     disabled