commit 067901ea815241754156b3ebd74c6c1cc598bb12
author Steven Moreland <smoreland@google.com> Tue Aug 31 16:47:14 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 31 16:47:14 2021 +0000
tree 22a137274c6ecfc4a4f52b4b794d0995e92e899b
parent d51dee1209ec8ea26030afae90230c794a5912b7
parent 15a92dad5dcd78dba7bc5207925cbc844b6e2c83

Merge changes from topic "b188871598-security"

* changes:
  neuralnetworks: use versions for imports
  .graphics.common: use versions for imports
  keymint: use versions for imports

graphics/common/aidl/Android.bp

diff --git a/graphics/common/aidl/Android.bp b/graphics/common/aidl/Android.bp
index cadd13c..2a7adce 100644
--- a/graphics/common/aidl/Android.bp
+++ b/graphics/common/aidl/Android.bp
@@ -21,7 +21,7 @@
     ],
     stability: "vintf",
     imports: [
-        "android.hardware.common",
+        "android.hardware.common-V2",
     ],
     backend: {
         java: {

neuralnetworks/aidl/Android.bp

diff --git a/neuralnetworks/aidl/Android.bp b/neuralnetworks/aidl/Android.bp
index 81252c7..4316c31 100644
--- a/neuralnetworks/aidl/Android.bp
+++ b/neuralnetworks/aidl/Android.bp
@@ -16,8 +16,8 @@
     ],
     stability: "vintf",
     imports: [
-        "android.hardware.common",
-        "android.hardware.graphics.common",
+        "android.hardware.common-V2",
+        "android.hardware.graphics.common-V2",
     ],
     backend: {
         java: {

security/keymint/aidl/Android.bp

diff --git a/security/keymint/aidl/Android.bp b/security/keymint/aidl/Android.bp
index 3796847..4bbfb35 100644
--- a/security/keymint/aidl/Android.bp
+++ b/security/keymint/aidl/Android.bp
@@ -14,7 +14,7 @@
         "android/hardware/security/keymint/*.aidl",
     ],
     imports: [
-        "android.hardware.security.secureclock",
+        "android.hardware.security.secureclock-V1",
     ],
     stability: "vintf",
     backend: {