From 926aa80f044b64d1d3263b7678d1c1ac493a8a64 Mon Sep 17 00:00:00 2001
From: Steven Moreland <smoreland@google.com>
Date: Mon, 6 Jan 2020 13:58:00 -0800
Subject: [PATCH] *common: use package as name

In order to provide a more descriptive name, and to be consistent
with HIDL, the stable AIDL package names are switching from
vintf-*common format to the package format
(android.hardware.*common).

Bug: N/A
Test: all build time
Change-Id: Ie1d92a50dddf7e3e1bd473e2a957279c6dadb865
---
 common/aidl/Android.bp                        | 2 +-
 graphics/common/aidl/Android.bp               | 4 ++--
 graphics/mapper/4.0/vts/functional/Android.bp | 7 +++++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/common/aidl/Android.bp b/common/aidl/Android.bp
index 6f2d292930..f55e799d0d 100644
--- a/common/aidl/Android.bp
+++ b/common/aidl/Android.bp
@@ -1,5 +1,5 @@
 aidl_interface {
-    name: "vintf-common",
+    name: "android.hardware.common",
     host_supported: true,
     vendor_available: true,
     vndk: {
diff --git a/graphics/common/aidl/Android.bp b/graphics/common/aidl/Android.bp
index fcd4efc68e..601cabc2e5 100644
--- a/graphics/common/aidl/Android.bp
+++ b/graphics/common/aidl/Android.bp
@@ -1,5 +1,5 @@
 aidl_interface {
-    name: "vintf-graphics-common",
+    name: "android.hardware.graphics.common",
     host_supported: true,
     vendor_available: true,
     vndk: {
@@ -11,7 +11,7 @@ aidl_interface {
     ],
     stability: "vintf",
     imports: [
-        "vintf-common"
+        "android.hardware.common",
     ],
     backend: {
         java: {
diff --git a/graphics/mapper/4.0/vts/functional/Android.bp b/graphics/mapper/4.0/vts/functional/Android.bp
index 926cf31f5c..3542a6ee89 100644
--- a/graphics/mapper/4.0/vts/functional/Android.bp
+++ b/graphics/mapper/4.0/vts/functional/Android.bp
@@ -19,10 +19,10 @@ cc_test {
     defaults: ["VtsHalTargetTestDefaults"],
     srcs: ["VtsHalGraphicsMapperV4_0TargetTest.cpp"],
     static_libs: [
+        "android.hardware.graphics.common-ndk_platform",
         "android.hardware.graphics.mapper@4.0-vts",
         "libgralloctypes",
         "libsync",
-        "vintf-graphics-common-ndk_platform",
     ],
     shared_libs: [
         "android.hardware.graphics.allocator@4.0",
@@ -34,5 +34,8 @@ cc_test {
     header_libs: [
         "libsystem_headers",
     ],
-    test_suites: ["general-tests", "vts-core"],
+    test_suites: [
+        "general-tests",
+        "vts-core",
+    ],
 }