From 63a733ab33647201fc5c26916f8b3c37419025ba Mon Sep 17 00:00:00 2001
From: Steven Moreland <smoreland@google.com>
Date: Tue, 23 May 2017 17:23:26 -0700
Subject: [PATCH] libhwbinder test: Android.mk -> Android.bp

Test: links

Change-Id: Iaaa27cb0f398ee4b9a273916454f3110ddee0e3b
---
 tests/Android.bp                  |  1 +
 tests/libhwbinder/aidl/Android.bp | 15 +++++++++++++++
 tests/libhwbinder/aidl/Android.mk | 13 -------------
 3 files changed, 16 insertions(+), 13 deletions(-)
 create mode 100644 tests/libhwbinder/aidl/Android.bp
 delete mode 100644 tests/libhwbinder/aidl/Android.mk

diff --git a/tests/Android.bp b/tests/Android.bp
index 7276a0b86c..8e4815cf0d 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -14,6 +14,7 @@ subdirs = [
     "inheritance/1.0/default",
     "libhwbinder/1.0",
     "libhwbinder/1.0/default",
+    "libhwbinder/aidl",
     "memory/1.0",
     "memory/1.0/default",
     "msgq/1.0",
diff --git a/tests/libhwbinder/aidl/Android.bp b/tests/libhwbinder/aidl/Android.bp
new file mode 100644
index 0000000000..a662085bf5
--- /dev/null
+++ b/tests/libhwbinder/aidl/Android.bp
@@ -0,0 +1,15 @@
+cc_library_shared {
+    name: "android.hardware.tests.libbinder",
+
+    srcs: ["android/tests/binder/IBenchmark.aidl"],
+
+    aidl: {
+        export_aidl_headers: true,
+    },
+
+    shared_libs: [
+        "libbinder",
+        "libutils",
+    ],
+
+}
diff --git a/tests/libhwbinder/aidl/Android.mk b/tests/libhwbinder/aidl/Android.mk
deleted file mode 100644
index 1c175d89b2..0000000000
--- a/tests/libhwbinder/aidl/Android.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := android.hardware.tests.libbinder
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-
-LOCAL_SRC_FILES := android/tests/binder/IBenchmark.aidl
-
-LOCAL_SHARED_LIBRARIES := \
-  libbinder \
-  libutils \
-
-include $(BUILD_SHARED_LIBRARY)