commit df3a5f8628db2cf4ec04e0652e217b72d5545e72
author Ruchi Kandoi <kandoiruchi@google.com> Wed Jun 13 17:13:35 2018 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Thu Jun 21 00:57:43 2018 +0000
tree a7642e4222d5396915ce677ba58e33d088f41ce2
parent 61b0a62b14c6457c84228476aa4a73e9a37812da

Add a disabled target for android.hardware.secure_element@1.0-service

Test: verify that the service doesn't start
Bug: 110053681
Change-Id: Icf2a29501240b4ab6145c936d5602939e11d99a3
(cherry picked from commit 32fbcc0a9c1ed828fe5ff741b9f2d5e55d268ba7)

1.0/android.hardware.secure_element@1.0-service-disabled.rc

diff --git a/1.0/android.hardware.secure_element@1.0-service-disabled.rc b/1.0/android.hardware.secure_element@1.0-service-disabled.rc
new file mode 100644
index 0000000..bb6ea2f
--- /dev/null
+++ b/1.0/android.hardware.secure_element@1.0-service-disabled.rc
@@ -0,0 +1,5 @@
+service secure_element_hal_service /vendor/bin/hw/android.hardware.secure_element@1.0-service-disabled
+    disabled
+    interface android.hardware.secure_element@1.0::ISecureElement eSE1
+    user secure_element
+    group secure_element

1.0/android.hardware.secure_element@1.0-service.rc

diff --git a/1.0/android.hardware.secure_element@1.0-service.rc b/1.0/android.hardware.secure_element@1.0-service.rc
index e446ada..f1e0966 100644
--- a/1.0/android.hardware.secure_element@1.0-service.rc
+++ b/1.0/android.hardware.secure_element@1.0-service.rc
@@ -1,4 +1,5 @@
 service secure_element_hal_service /vendor/bin/hw/android.hardware.secure_element@1.0-service
     class hal
+    interface android.hardware.secure_element@1.0::ISecureElement eSE1
     user secure_element
     group secure_element

Android.bp

diff --git a/Android.bp b/Android.bp
index b1ca712..d1a00fb 100755
--- a/Android.bp
+++ b/Android.bp
@@ -79,10 +79,9 @@
     ],
 }
 
-cc_binary {
-    name: "android.hardware.secure_element@1.0-service",
+cc_defaults {
+    name: "android.hardware.secure_element@1.0_defaults",
     relative_install_path: "hw",
-    init_rc: ["1.0/android.hardware.secure_element@1.0-service.rc"],
     proprietary: true,
     defaults: ["hidl_defaults"],
     srcs: [
@@ -107,3 +106,15 @@
         "vendor.nxp.nxpnfc@1.0",
     ],
 }
+
+cc_binary {
+    name: "android.hardware.secure_element@1.0-service",
+    init_rc: ["1.0/android.hardware.secure_element@1.0-service.rc"],
+    defaults: ["android.hardware.secure_element@1.0_defaults"],
+}
+
+cc_binary {
+    name: "android.hardware.secure_element@1.0-service-disabled",
+    init_rc: ["1.0/android.hardware.secure_element@1.0-service-disabled.rc"],
+    defaults: ["android.hardware.secure_element@1.0_defaults"],
+}