From f4562215b4f12d2632256424fd90007e0e9e2364 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Mon, 30 Aug 2021 17:54:19 -0700 Subject: [PATCH 1/3] keymint: use versions for imports This makes sure that when developers add a new version of an interface, or when interfaces are being frozen, the runtime/buildtime situation of clients depending on those interfaces remains the same. This is required for AIDL to continue working at scale. Bug: 188871598 Test: build Change-Id: I358c19c91e8b20d47967aa3b26a8aa5dd6a97ab6 --- security/keymint/aidl/Android.bp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/keymint/aidl/Android.bp b/security/keymint/aidl/Android.bp index 37968471f0..4bbfb35860 100644 --- a/security/keymint/aidl/Android.bp +++ b/security/keymint/aidl/Android.bp @@ -14,7 +14,7 @@ aidl_interface { "android/hardware/security/keymint/*.aidl", ], imports: [ - "android.hardware.security.secureclock", + "android.hardware.security.secureclock-V1", ], stability: "vintf", backend: { From b196a659d219cd4117b345c7e2d61aeb4d18d137 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Mon, 30 Aug 2021 17:56:06 -0700 Subject: [PATCH 2/3] .graphics.common: use versions for imports This makes sure that when developers add a new version of an interface, or when interfaces are being frozen, the runtime/buildtime situation of clients depending on those interfaces remains the same. This is required for AIDL to continue working at scale. Bug: 188871598 Test: build Change-Id: I5d85ed0f8d5cbeb0ec20659def492bc97787d9a9 --- graphics/common/aidl/Android.bp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphics/common/aidl/Android.bp b/graphics/common/aidl/Android.bp index cadd13cdde..2a7adced97 100644 --- a/graphics/common/aidl/Android.bp +++ b/graphics/common/aidl/Android.bp @@ -21,7 +21,7 @@ aidl_interface { ], stability: "vintf", imports: [ - "android.hardware.common", + "android.hardware.common-V2", ], backend: { java: { From 15a92dad5dcd78dba7bc5207925cbc844b6e2c83 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Mon, 30 Aug 2021 18:02:43 -0700 Subject: [PATCH 3/3] neuralnetworks: use versions for imports This makes sure that when developers add a new version of an interface, or when interfaces are being frozen, the runtime/buildtime situation of clients depending on those interfaces remains the same. This is required for AIDL to continue working at scale. Bug: 188871598 Test: build Change-Id: Ib4c6e8f5bf34cc333675201dca4eab08dd88628d --- neuralnetworks/aidl/Android.bp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neuralnetworks/aidl/Android.bp b/neuralnetworks/aidl/Android.bp index 81252c7337..4316c3127c 100644 --- a/neuralnetworks/aidl/Android.bp +++ b/neuralnetworks/aidl/Android.bp @@ -16,8 +16,8 @@ aidl_interface { ], stability: "vintf", imports: [ - "android.hardware.common", - "android.hardware.graphics.common", + "android.hardware.common-V2", + "android.hardware.graphics.common-V2", ], backend: { java: {