Merge f33a39f7e8bd3be75a6843470449ccd86824bf97 on remote branch

Change-Id: Ib3380a428c674f75792873e223cfec3b236bf982
diff --git a/display/config/1.0/Android.bp b/display/config/1.0/Android.bp
index 6921126..a74bb0d 100644
--- a/display/config/1.0/Android.bp
+++ b/display/config/1.0/Android.bp
@@ -10,7 +10,7 @@
 genrule {
     name: "vendor.display.config@1.0_genc++",
     tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hidl:system/libhidl/transport -rvendor:vendor/qcom/opensource/interfaces vendor.display.config@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hidl:system/libhidl/transport -rvendor:vendor/qcom/opensource/interfaces/ vendor.display.config@1.0",
     srcs: [
         ":vendor.display.config@1.0_hal",
     ],
@@ -22,7 +22,7 @@
 genrule {
     name: "vendor.display.config@1.0_genc++_headers",
     tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hidl:system/libhidl/transport -rvendor:vendor/qcom/opensource/interfaces vendor.display.config@1.0",
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hidl:system/libhidl/transport -rvendor:vendor/qcom/opensource/interfaces/ vendor.display.config@1.0",
     srcs: [
         ":vendor.display.config@1.0_hal",
     ],
@@ -37,6 +37,32 @@
 
 cc_library_shared {
     name: "vendor.display.config@1.0",
+    defaults: ["hidl-module-defaults"],
+    generated_sources: ["vendor.display.config@1.0_genc++"],
+    generated_headers: ["vendor.display.config@1.0_genc++_headers"],
+    export_generated_headers: ["vendor.display.config@1.0_genc++_headers"],
+    vendor_available: true,
+    shared_libs: [
+        "libhidlbase",
+        "libhidltransport",
+        "libhwbinder",
+        "liblog",
+        "libutils",
+        "libcutils",
+        "android.hidl.base@1.0",
+    ],
+    export_shared_lib_headers: [
+        "libhidlbase",
+        "libhidltransport",
+        "libhwbinder",
+        "libutils",
+        "android.hidl.base@1.0",
+    ],
+}
+
+cc_library_shared {
+    name: "vendor.display.config@1.0_vendor",
+    defaults: ["hidl-module-defaults"],
     generated_sources: ["vendor.display.config@1.0_genc++"],
     generated_headers: ["vendor.display.config@1.0_genc++_headers"],
     export_generated_headers: ["vendor.display.config@1.0_genc++_headers"],