Remove ndk_platform backend. Use the ndk backend.
The ndk_platform backend will soon be deprecated because the ndk backend
can serve the same purpose. This is to eliminate the confusion about
having two variants (ndk and ndk_platform) for the same 'ndk' backend.
Bug: 161456198
Test: m
Change-Id: Ibeb4178f99857be75bb5f83a073a2d679058d921
diff --git a/identity/Android.bp b/identity/Android.bp
index 8267a6b..ecdf9a4 100644
--- a/identity/Android.bp
+++ b/identity/Android.bp
@@ -48,8 +48,8 @@
"android.hardware.identity-support-lib",
"libkeymaster4support",
"libkeystore-attestation-application-id",
- "android.hardware.security.keymint-V1-ndk_platform",
- "android.security.authorization-ndk_platform",
+ "android.hardware.security.keymint-V1-ndk",
+ "android.security.authorization-ndk",
],
static_libs: [
"android.hardware.identity-V3-cpp",
diff --git a/keystore-engine/Android.bp b/keystore-engine/Android.bp
index 0cecfd8..cb75cde 100644
--- a/keystore-engine/Android.bp
+++ b/keystore-engine/Android.bp
@@ -36,7 +36,7 @@
],
shared_libs: [
- "android.system.keystore2-V1-ndk_platform",
+ "android.system.keystore2-V1-ndk",
"libbinder_ndk",
"libcrypto",
"libcutils",
@@ -66,7 +66,7 @@
],
shared_libs: [
- "android.system.keystore2-V1-ndk_platform",
+ "android.system.keystore2-V1-ndk",
"libbase",
"libbinder_ndk",
"libcrypto",
diff --git a/keystore/Android.bp b/keystore/Android.bp
index b59bacc..39208c6 100644
--- a/keystore/Android.bp
+++ b/keystore/Android.bp
@@ -47,8 +47,8 @@
"keystore_client.proto",
],
shared_libs: [
- "android.security.apc-ndk_platform",
- "android.system.keystore2-V1-ndk_platform",
+ "android.security.apc-ndk",
+ "android.system.keystore2-V1-ndk",
"libbinder",
"libbinder_ndk",
"libchrome",
diff --git a/keystore/tests/Android.bp b/keystore/tests/Android.bp
index 39601eb..f51cc2f 100644
--- a/keystore/tests/Android.bp
+++ b/keystore/tests/Android.bp
@@ -62,7 +62,7 @@
"libgtest_main",
"libutils",
"liblog",
- "android.security.apc-ndk_platform",
+ "android.security.apc-ndk",
],
shared_libs: [
"libbinder_ndk",
diff --git a/keystore2/Android.bp b/keystore2/Android.bp
index 64636ac..723c4c9 100644
--- a/keystore2/Android.bp
+++ b/keystore2/Android.bp
@@ -124,8 +124,8 @@
// be removed once that works correctly.
shared_libs: [
"android.hardware.confirmationui@1.0",
- "android.hardware.security.sharedsecret-V1-ndk_platform",
- "android.security.compat-ndk_platform",
+ "android.hardware.security.sharedsecret-V1-ndk",
+ "android.security.compat-ndk",
"libc",
"libdl_android",
"libdl",
diff --git a/keystore2/src/km_compat/Android.bp b/keystore2/src/km_compat/Android.bp
index 541788e..32406ae 100644
--- a/keystore2/src/km_compat/Android.bp
+++ b/keystore2/src/km_compat/Android.bp
@@ -57,11 +57,11 @@
"android.hardware.keymaster@3.0",
"android.hardware.keymaster@4.0",
"android.hardware.keymaster@4.1",
- "android.hardware.security.keymint-V1-ndk_platform",
- "android.hardware.security.secureclock-V1-ndk_platform",
- "android.hardware.security.sharedsecret-V1-ndk_platform",
- "android.security.compat-ndk_platform",
- "android.system.keystore2-V1-ndk_platform",
+ "android.hardware.security.keymint-V1-ndk",
+ "android.hardware.security.secureclock-V1-ndk",
+ "android.hardware.security.sharedsecret-V1-ndk",
+ "android.security.compat-ndk",
+ "android.system.keystore2-V1-ndk",
"libbase",
"libbinder_ndk",
"libcrypto",
@@ -78,10 +78,10 @@
name: "libkm_compat_service",
srcs: ["km_compat_service.cpp"],
shared_libs: [
- "android.hardware.security.keymint-V1-ndk_platform",
- "android.hardware.security.secureclock-V1-ndk_platform",
- "android.hardware.security.sharedsecret-V1-ndk_platform",
- "android.security.compat-ndk_platform",
+ "android.hardware.security.keymint-V1-ndk",
+ "android.hardware.security.secureclock-V1-ndk",
+ "android.hardware.security.sharedsecret-V1-ndk",
+ "android.security.compat-ndk",
"libbinder_ndk",
"libcrypto",
"libkm_compat",
@@ -107,11 +107,11 @@
"android.hardware.keymaster@3.0",
"android.hardware.keymaster@4.0",
"android.hardware.keymaster@4.1",
- "android.hardware.security.keymint-V1-ndk_platform",
- "android.hardware.security.secureclock-V1-ndk_platform",
- "android.hardware.security.sharedsecret-V1-ndk_platform",
- "android.security.compat-ndk_platform",
- "android.system.keystore2-V1-ndk_platform",
+ "android.hardware.security.keymint-V1-ndk",
+ "android.hardware.security.secureclock-V1-ndk",
+ "android.hardware.security.sharedsecret-V1-ndk",
+ "android.security.compat-ndk",
+ "android.system.keystore2-V1-ndk",
"libbase",
"libbinder_ndk",
"libcrypto",
diff --git a/provisioner/Android.bp b/provisioner/Android.bp
index afbc405..aac4878 100644
--- a/provisioner/Android.bp
+++ b/provisioner/Android.bp
@@ -48,7 +48,7 @@
vendor: true,
srcs: ["rkp_factory_extraction_tool.cpp"],
shared_libs: [
- "android.hardware.security.keymint-V1-ndk_platform",
+ "android.hardware.security.keymint-V1-ndk",
"libbinder",
"libbinder_ndk",
"libcrypto",