commit 2947d47475118ac2e754579779f69fcb78d11dec
author Shawn Willden <swillden@google.com> Thu Jul 12 15:12:14 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jul 12 15:12:14 2018 -0700
tree cb9a031bd02cd425bf040e961a5ef6e0b348073c
parent b7f999a0b9445e138f546251d8e2a6c58d4573d6
parent 926f647663d589f7b16887ecd10162b64736e521

Use TEE keymaster for ID attestation.
am: 926f647663

Change-Id: I145db12dca5595c0b2e18b324064cd328a7d159e

keystore/Android.bp

diff --git a/keystore/Android.bp b/keystore/Android.bp
index 8af8717..37bc6a8 100644
--- a/keystore/Android.bp
+++ b/keystore/Android.bp
@@ -85,7 +85,6 @@
 cc_binary {
     name: "keystore_cli",
     defaults: ["keystore_defaults"],
-    tags: ["debug"],
 
     srcs: ["keystore_cli.cpp"],
     shared_libs: [
@@ -106,7 +105,6 @@
 cc_binary {
     name: "keystore_cli_v2",
     defaults: ["keystore_defaults"],
-    tags: ["debug"],
 
     cflags: [
         "-DKEYMASTER_NAME_TAGS",

keystore/tests/Android.bp

diff --git a/keystore/tests/Android.bp b/keystore/tests/Android.bp
index c3f5177..73459c1 100644
--- a/keystore/tests/Android.bp
+++ b/keystore/tests/Android.bp
@@ -14,7 +14,6 @@
         "gtest_main.cpp",
     ],
     name: "keystore_unit_tests",
-    tags: ["test"],
     static_libs: [
         "android.hardware.confirmationui@1.0",
         "libbase",