commit b1088c6de1017a843be115117c1bbde3c51118af
author Treehugger Robot <treehugger-gerrit@google.com> Mon Nov 06 17:56:38 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 06 17:56:38 2017 +0000
tree f24d1524119c2fd7cc5dc79434fe69ae051d52f6
parent 55e7774568b22da3d215d455b8469ce34b40f191
parent 71f26bf5ccde4265d94868f817112000ab1be84c

Merge "dumpstate mk -> bp"

dumpstate/1.0/default/Android.bp

diff --git a/dumpstate/1.0/default/Android.bp b/dumpstate/1.0/default/Android.bp
new file mode 100644
index 0000000..41ccd59
--- /dev/null
+++ b/dumpstate/1.0/default/Android.bp
@@ -0,0 +1,22 @@
+cc_binary {
+    name: "android.hardware.dumpstate@1.0-service",
+    init_rc: ["android.hardware.dumpstate@1.0-service.rc"],
+    relative_install_path: "hw",
+    vendor: true,
+    srcs: [
+        "DumpstateDevice.cpp",
+        "service.cpp",
+    ],
+
+    shared_libs: [
+        "android.hardware.dumpstate@1.0",
+        "libbase",
+        "libcutils",
+        "libdumpstateutil",
+        "libhidlbase",
+        "libhidltransport",
+        "liblog",
+        "libutils",
+    ],
+
+}

dumpstate/1.0/default/Android.mk

diff --git a/dumpstate/1.0/default/Android.mk b/dumpstate/1.0/default/Android.mk
deleted file mode 100644
index 0b07f49..0000000
--- a/dumpstate/1.0/default/Android.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := android.hardware.dumpstate@1.0-service
-LOCAL_INIT_RC := android.hardware.dumpstate@1.0-service.rc
-LOCAL_MODULE_RELATIVE_PATH := hw
-LOCAL_PROPRIETARY_MODULE := true
-LOCAL_SRC_FILES := \
-    DumpstateDevice.cpp \
-    service.cpp
-
-LOCAL_SHARED_LIBRARIES := \
-    android.hardware.dumpstate@1.0 \
-    libbase \
-    libcutils \
-    libdumpstateutil \
-    libhidlbase \
-    libhidltransport \
-    liblog \
-    libutils
-
-include $(BUILD_EXECUTABLE)

dumpstate/Android.bp

diff --git a/dumpstate/Android.bp b/dumpstate/Android.bp
index 33f70eb..ed19a37 100644
--- a/dumpstate/Android.bp
+++ b/dumpstate/Android.bp
@@ -1,5 +1,6 @@
 // This is an autogenerated file, do not edit.
 subdirs = [
     "1.0",
+    "1.0/default",
     "1.0/vts/functional",
 ]