commit 34fd9e2bd6cdc6dd061ea44ef8d33feffaa2927b
author Jeongik Cha <jeongik@google.com> Thu Jan 28 00:49:52 2021 +0900
committer Jeongik Cha <jeongik@google.com> Thu Jan 28 00:56:43 2021 +0000
tree 76c113e846fcf28b8e269202f6966250253e5048
parent 4bc2119776655c99f33f8515970445c488b73efc

Specify version for aidl_interface explicitly

Bug: 150578172
Test: m
Change-Id: I6c75d6e41b5f19a0c0a22a59b05b26867c87cd7c
Merged-In: Id3f42db3ccad424e9a1164c276b0e89cbefa3483
Merged-In: Iab32a5025f5e85bcd6c1b9aac93fed816ae6884e

hal/audiocontrol/aidl/1.0/Android.bp

diff --git a/hal/audiocontrol/aidl/1.0/Android.bp b/hal/audiocontrol/aidl/1.0/Android.bp
index 5566cbe..35d7110 100644
--- a/hal/audiocontrol/aidl/1.0/Android.bp
+++ b/hal/audiocontrol/aidl/1.0/Android.bp
@@ -75,7 +75,7 @@
     ],
     header_libs: ["libxsdc-utils"],
     shared_libs: [
-        "android.hardware.automotive.audiocontrol-ndk_platform",
+        "android.hardware.automotive.audiocontrol-V1-ndk_platform",
         "libgrpc++",
         "libprotobuf-cpp-full",
         "libbase",
@@ -101,9 +101,9 @@
     header_libs: ["libxsdc-utils"],
     shared_libs: [
         "android.hardware.automotive.audiocontrol-server.trout",
-        "android.hardware.automotive.audiocontrol-ndk_platform",
+        "android.hardware.automotive.audiocontrol-V1-ndk_platform",
         "android.hardware.automotive.utils.watchdog",
-        "android.automotive.watchdog-ndk_platform",
+        "android.automotive.watchdog-V2-ndk_platform",
         "libbase",
         "libbinder_ndk",
         "libutils",

hal/common/android/watchdog/Android.bp

diff --git a/hal/common/android/watchdog/Android.bp b/hal/common/android/watchdog/Android.bp
index b3ddffb..59834c4 100644
--- a/hal/common/android/watchdog/Android.bp
+++ b/hal/common/android/watchdog/Android.bp
@@ -23,7 +23,7 @@
     ],
     export_include_dirs: ["."],
     shared_libs: [
-        "android.automotive.watchdog-ndk_platform",
+        "android.automotive.watchdog-V2-ndk_platform",
         "libbase",
         "libbinder_ndk",
         "libhidlbase",

hal/dumpstate/1.1/Android.bp

diff --git a/hal/dumpstate/1.1/Android.bp b/hal/dumpstate/1.1/Android.bp
index ce3f6ce..d9ff322 100644
--- a/hal/dumpstate/1.1/Android.bp
+++ b/hal/dumpstate/1.1/Android.bp
@@ -70,7 +70,7 @@
         "android.hardware.automotive.utils.watchdog",
         "android.hardware.dumpstate@1.0",
         "android.hardware.dumpstate@1.1",
-        "android.automotive.watchdog-ndk_platform",
+        "android.automotive.watchdog-V2-ndk_platform",
         "libbase",
         "libbinder_ndk",
         "libcutils",