lineage/interfaces: Regenerate HIDL makefiles and blueprints for pie

Yay... new formats.

Change-Id: I679fa4e024dacf11078b1aa1dc9bfc9e37098d3f

3 files changed, 10 insertions, 240 deletions

diff --git a/power/1.0/Android.bp b/power/1.0/Android.bp
index 3741342..8957c4d 100644
--- a/power/1.0/Android.bp
+++ b/power/1.0/Android.bp
@@ -1,89 +1,19 @@
-// This file is autogenerated by hidl-gen. Do not edit manually.
+// This file is autogenerated by hidl-gen -Landroidbp.
 
-filegroup {
-    name: "vendor.lineage.power@1.0_hal",
+hidl_interface {
+    name: "vendor.lineage.power@1.0",
+    root: "vendor.lineage",
     srcs: [
         "types.hal",
         "ILineagePower.hal",
     ],
-}
-
-genrule {
-    name: "vendor.lineage.power@1.0_genc++",
-    tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hidl:system/libhidl/transport -rvendor.lineage:hardware/lineage/interfaces vendor.lineage.power@1.0",
-    srcs: [
-        ":vendor.lineage.power@1.0_hal",
-    ],
-    out: [
-        "vendor/lineage/power/1.0/types.cpp",
-        "vendor/lineage/power/1.0/LineagePowerAll.cpp",
-    ],
-}
-
-genrule {
-    name: "vendor.lineage.power@1.0_genc++_headers",
-    tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hidl:system/libhidl/transport -rvendor.lineage:hardware/lineage/interfaces vendor.lineage.power@1.0",
-    srcs: [
-        ":vendor.lineage.power@1.0_hal",
+    interfaces: [
+        "android.hidl.base@1.0",
     ],
-    out: [
-        "vendor/lineage/power/1.0/types.h",
-        "vendor/lineage/power/1.0/hwtypes.h",
-        "vendor/lineage/power/1.0/ILineagePower.h",
-        "vendor/lineage/power/1.0/IHwLineagePower.h",
-        "vendor/lineage/power/1.0/BnHwLineagePower.h",
-        "vendor/lineage/power/1.0/BpHwLineagePower.h",
-        "vendor/lineage/power/1.0/BsLineagePower.h",
+    types: [
+        "LineageFeature",
+        "LineagePowerHint",
     ],
+    gen_java: true,
 }
 
-cc_library {
-    name: "vendor.lineage.power@1.0",
-    defaults: ["hidl-module-defaults"],
-    generated_sources: ["vendor.lineage.power@1.0_genc++"],
-    generated_headers: ["vendor.lineage.power@1.0_genc++_headers"],
-    export_generated_headers: ["vendor.lineage.power@1.0_genc++_headers"],
-    vendor_available: true,
-    vndk: {
-        enabled: true,
-    },
-    shared_libs: [
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "liblog",
-        "libutils",
-        "libcutils",
-    ],
-    export_shared_lib_headers: [
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libutils",
-    ],
-}
-
-cc_library {
-    name: "vendor.lineage.power@1.0_vendor",
-    defaults: ["hidl-module-defaults"],
-    generated_sources: ["vendor.lineage.power@1.0_genc++"],
-    generated_headers: ["vendor.lineage.power@1.0_genc++_headers"],
-    export_generated_headers: ["vendor.lineage.power@1.0_genc++_headers"],
-    vendor: true,
-    shared_libs: [
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "liblog",
-        "libutils",
-        "libcutils",
-    ],
-    export_shared_lib_headers: [
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libutils",
-    ],
-}
diff --git a/power/1.0/Android.mk b/power/1.0/Android.mk
deleted file mode 100644
index 3947f67..0000000
--- a/power/1.0/Android.mk
+++ /dev/null
@@ -1,156 +0,0 @@
-# This file is autogenerated by hidl-gen. Do not edit manually.
-
-LOCAL_PATH := $(call my-dir)
-
-################################################################################
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := vendor.lineage.power-V1.0-java
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-
-intermediates := $(call local-generated-sources-dir, COMMON)
-
-HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
-
-LOCAL_JAVA_LIBRARIES := \
-    android.hidl.base-V1.0-java \
-
-
-#
-# Build types.hal (LineageFeature)
-#
-GEN := $(intermediates)/vendor/lineage/power/V1_0/LineageFeature.java
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
-        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-        -Ljava \
-        -randroid.hidl:system/libhidl/transport \
-        -rvendor.lineage:hardware/lineage/interfaces \
-        vendor.lineage.power@1.0::types.LineageFeature
-
-$(GEN): $(LOCAL_PATH)/types.hal
-	$(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-
-#
-# Build types.hal (LineagePowerHint)
-#
-GEN := $(intermediates)/vendor/lineage/power/V1_0/LineagePowerHint.java
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
-        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-        -Ljava \
-        -randroid.hidl:system/libhidl/transport \
-        -rvendor.lineage:hardware/lineage/interfaces \
-        vendor.lineage.power@1.0::types.LineagePowerHint
-
-$(GEN): $(LOCAL_PATH)/types.hal
-	$(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-
-#
-# Build ILineagePower.hal
-#
-GEN := $(intermediates)/vendor/lineage/power/V1_0/ILineagePower.java
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ILineagePower.hal
-$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
-$(GEN): $(LOCAL_PATH)/types.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
-        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-        -Ljava \
-        -randroid.hidl:system/libhidl/transport \
-        -rvendor.lineage:hardware/lineage/interfaces \
-        vendor.lineage.power@1.0::ILineagePower
-
-$(GEN): $(LOCAL_PATH)/ILineagePower.hal
-	$(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-include $(BUILD_JAVA_LIBRARY)
-
-
-################################################################################
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := vendor.lineage.power-V1.0-java-static
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-
-intermediates := $(call local-generated-sources-dir, COMMON)
-
-HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    android.hidl.base-V1.0-java-static \
-
-
-#
-# Build types.hal (LineageFeature)
-#
-GEN := $(intermediates)/vendor/lineage/power/V1_0/LineageFeature.java
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
-        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-        -Ljava \
-        -randroid.hidl:system/libhidl/transport \
-        -rvendor.lineage:hardware/lineage/interfaces \
-        vendor.lineage.power@1.0::types.LineageFeature
-
-$(GEN): $(LOCAL_PATH)/types.hal
-	$(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-
-#
-# Build types.hal (LineagePowerHint)
-#
-GEN := $(intermediates)/vendor/lineage/power/V1_0/LineagePowerHint.java
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
-        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-        -Ljava \
-        -randroid.hidl:system/libhidl/transport \
-        -rvendor.lineage:hardware/lineage/interfaces \
-        vendor.lineage.power@1.0::types.LineagePowerHint
-
-$(GEN): $(LOCAL_PATH)/types.hal
-	$(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-
-#
-# Build ILineagePower.hal
-#
-GEN := $(intermediates)/vendor/lineage/power/V1_0/ILineagePower.java
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ILineagePower.hal
-$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
-$(GEN): $(LOCAL_PATH)/types.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
-        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-        -Ljava \
-        -randroid.hidl:system/libhidl/transport \
-        -rvendor.lineage:hardware/lineage/interfaces \
-        vendor.lineage.power@1.0::ILineagePower
-
-$(GEN): $(LOCAL_PATH)/ILineagePower.hal
-	$(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/power/Android.bp b/power/Android.bp
deleted file mode 100644
index bbb3e4b..0000000
--- a/power/Android.bp
+++ /dev/null
@@ -1,4 +0,0 @@
-// This is an autogenerated file, do not edit.
-subdirs = [
-    "1.0",
-]