Update makefiles for adapters. am: 32ba4deeda am: 46042784aa am: 4ed381e09e
am: 7d3d54d477

Change-Id: I81e2343cbbf73eee03d0feb1d9b9b134edda7492
diff --git a/wifi/keystore/1.0/Android.bp b/wifi/keystore/1.0/Android.bp
index ae451c3..91f4555 100644
--- a/wifi/keystore/1.0/Android.bp
+++ b/wifi/keystore/1.0/Android.bp
@@ -60,3 +60,76 @@
         "libutils",
     ],
 }
+
+genrule {
+    name: "android.system.wifi.keystore@1.0-adapter-helper_genc++",
+    tools: ["hidl-gen"],
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hidl:system/libhidl/transport -randroid.system:system/hardware/interfaces android.system.wifi.keystore@1.0",
+    srcs: [
+        ":android.system.wifi.keystore@1.0_hal",
+    ],
+    out: [
+        "android/system/wifi/keystore/1.0/AKeystore.cpp",
+    ],
+}
+
+genrule {
+    name: "android.system.wifi.keystore@1.0-adapter-helper_genc++_headers",
+    tools: ["hidl-gen"],
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hidl:system/libhidl/transport -randroid.system:system/hardware/interfaces android.system.wifi.keystore@1.0",
+    srcs: [
+        ":android.system.wifi.keystore@1.0_hal",
+    ],
+    out: [
+        "android/system/wifi/keystore/1.0/AKeystore.h",
+    ],
+}
+
+
+cc_library {
+    name: "android.system.wifi.keystore@1.0-adapter-helper",
+    defaults: ["hidl-module-defaults"],
+    generated_sources: ["android.system.wifi.keystore@1.0-adapter-helper_genc++"],
+    generated_headers: ["android.system.wifi.keystore@1.0-adapter-helper_genc++_headers"],
+    export_generated_headers: ["android.system.wifi.keystore@1.0-adapter-helper_genc++_headers"],
+    vendor_available: true,
+    shared_libs: [
+        "libhidlbase",
+        "libhidltransport",
+        "libhwbinder",
+        "liblog",
+        "libutils",
+        "libcutils",
+        "libhidladapter",
+        "android.system.wifi.keystore@1.0",
+        "android.hidl.base@1.0-adapter-helper",
+    ],
+    export_shared_lib_headers: [
+        "libhidlbase",
+        "libhidltransport",
+        "libhwbinder",
+        "libutils",
+        "libhidladapter",
+        "android.system.wifi.keystore@1.0",
+        "android.hidl.base@1.0-adapter-helper",
+    ],
+}
+
+genrule {
+    name: "android.system.wifi.keystore@1.0-adapter_genc++",
+    tools: ["hidl-gen"],
+    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hidl:system/libhidl/transport -randroid.system:system/hardware/interfaces android.system.wifi.keystore@1.0",
+    out: ["main.cpp"]}
+
+cc_test {
+    name: "android.system.wifi.keystore@1.0-adapter",
+    shared_libs: [
+        "libhidladapter",
+        "libhidlbase",
+        "libhidltransport",
+        "libutils",
+        "android.system.wifi.keystore@1.0",
+        "android.system.wifi.keystore@1.0-adapter-helper",
+    ],
+    generated_sources: ["android.system.wifi.keystore@1.0-adapter_genc++"],
+}