diff options
author | Shaquille Johnson <ssjohnson@google.com> | 2022-11-08 15:21:51 +0000 |
---|---|---|
committer | Shaquille Johnson <ssjohnson@google.com> | 2022-12-06 17:45:42 +0000 |
commit | 615ee36224109cdbf6807bc87b883647d9c94eed (patch) | |
tree | a80c0a3fb8b37d6b2f3c982522380909d82f0d89 | |
parent | 2377248cd64666563178acb92b5580776bc4acf2 (diff) | |
download | security-615ee36224109cdbf6807bc87b883647d9c94eed.tar.gz |
Add java_defaults to Android.bp and update default
This makes a java defaults and catches a few
places where the files were not updated
to use the default latest library version
Test: Run and tested using `atest keystore2_test` for Rust test and CTS test with `atest CtsKeystoreTestCases`
Change-Id: I2b67e482f341405e2aa23d53535e8b3d0b41cfab
-rw-r--r-- | keystore2/aidl/Android.bp | 49 | ||||
-rw-r--r-- | keystore2/android.system.keystore2-service.xml | 2 |
2 files changed, 45 insertions, 6 deletions
diff --git a/keystore2/aidl/Android.bp b/keystore2/aidl/Android.bp index 1e6d4dc0..e3961da3 100644 --- a/keystore2/aidl/Android.bp +++ b/keystore2/aidl/Android.bp @@ -128,7 +128,7 @@ aidl_interface { name: "android.security.maintenance", srcs: [ "android/security/maintenance/*.aidl" ], imports: [ - "android.system.keystore2-V2", + "android.system.keystore2-V3", ], unstable: true, backend: { @@ -167,7 +167,7 @@ aidl_interface { name: "android.security.metrics", srcs: [ "android/security/metrics/*.aidl" ], imports: [ - "android.system.keystore2-V2", + "android.system.keystore2-V3", ], unstable: true, backend: { @@ -184,29 +184,68 @@ aidl_interface { }, } +// java_defaults that includes the latest Keystore2 AIDL library. +// Modules that depend on KeyMint directly can include this java_defaults to avoid +// managing dependency versions explicitly. +java_defaults { + name: "keystore2_use_latest_aidl_java_static", + static_libs: [ + "android.system.keystore2-V3-java-source" + ], +} + +java_defaults { + name: "keystore2_use_latest_aidl_java_shared", + libs: [ + "android.system.keystore2-V3-java-source" + ], +} + +java_defaults { + name: "keystore2_use_latest_aidl_java", + libs: [ + "android.system.keystore2-V3-java" + ], +} + // cc_defaults that includes the latest Keystore2 AIDL library. // Modules that depend on KeyMint directly can include this cc_defaults to avoid // managing dependency versions explicitly. cc_defaults { name: "keystore2_use_latest_aidl_ndk_static", static_libs: [ - "android.system.keystore2-V2-ndk", + "android.system.keystore2-V3-ndk", ], } cc_defaults { name: "keystore2_use_latest_aidl_ndk_shared", shared_libs: [ - "android.system.keystore2-V2-ndk", + "android.system.keystore2-V3-ndk", ], } +cc_defaults { + name: "keystore2_use_latest_aidl_cpp_shared", + shared_libs: [ + "android.system.keystore2-V3-cpp", + ], +} + +cc_defaults { + name: "keystore2_use_latest_aidl_cpp_static", + static_libs: [ + "android.system.keystore2-V3-cpp", + ], +} + + // A rust_defaults that includes the latest Keystore2 AIDL library. // Modules that depend on Keystore2 directly can include this rust_defaults to avoid // managing dependency versions explicitly. rust_defaults { name: "keystore2_use_latest_aidl_rust", rustlibs: [ - "android.system.keystore2-V2-rust", + "android.system.keystore2-V3-rust", ], } diff --git a/keystore2/android.system.keystore2-service.xml b/keystore2/android.system.keystore2-service.xml index 20c2fba9..45f995c8 100644 --- a/keystore2/android.system.keystore2-service.xml +++ b/keystore2/android.system.keystore2-service.xml @@ -1,7 +1,7 @@ <manifest version="1.0" type="framework"> <hal format="aidl"> <name>android.system.keystore2</name> - <version>2</version> + <version>3</version> <interface> <name>IKeystoreService</name> <instance>default</instance> |