diff options
author | Steven Moreland <smoreland@google.com> | 2017-10-11 11:09:24 -0700 |
---|---|---|
committer | Steven Moreland <smoreland@google.com> | 2017-10-11 18:30:28 +0000 |
commit | f390f03aa41691939f95729f3989feac03ee2f83 (patch) | |
tree | bf28d1fe284968d4aeccd2148a260b02e2539fd9 /power | |
parent | 1d7374c5e168c825b75185af53c77f4eae9eea2c (diff) | |
download | android_hardware_interfaces-f390f03aa41691939f95729f3989feac03ee2f83.tar.gz android_hardware_interfaces-f390f03aa41691939f95729f3989feac03ee2f83.tar.bz2 android_hardware_interfaces-f390f03aa41691939f95729f3989feac03ee2f83.zip |
Update for Soong-only makefiles.
Test: pass
Bug: 33420795
Change-Id: Ibec6d1e38939b9e7566a96381439be2aac3bf8ca
Diffstat (limited to 'power')
-rw-r--r-- | power/1.1/Android.bp | 31 | ||||
-rw-r--r-- | power/1.1/Android.mk | 84 |
2 files changed, 30 insertions, 85 deletions
diff --git a/power/1.1/Android.bp b/power/1.1/Android.bp index 8da0894a5..cea638350 100644 --- a/power/1.1/Android.bp +++ b/power/1.1/Android.bp @@ -68,6 +68,35 @@ cc_library { } genrule { + name: "android.hardware.power-V1.1-java_gen_java", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.power@1.1", + srcs: [ + ":android.hardware.power@1.1_hal", + ], + out: [ + "android/hardware/power/V1_1/PowerStateSubsystem.java", + "android/hardware/power/V1_1/PowerStateSubsystemSleepState.java", + "android/hardware/power/V1_1/IPower.java", + ], +} + +java_library { + name: "android.hardware.power-V1.1-java", + no_framework_libs: true, + defaults: ["hidl-java-module-defaults"], + srcs: [":android.hardware.power-V1.1-java_gen_java"], + libs: [ + "hwbinder", + "android.hardware.power-V1.0-java", + "android.hidl.base-V1.0-java", + ] +} + +// This package does not export any types. Not creating java constants export. + + +genrule { name: "android.hardware.power@1.1-adapter-helper_genc++", tools: ["hidl-gen"], cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.power@1.1", @@ -91,7 +120,6 @@ genrule { ], } - cc_library { name: "android.hardware.power@1.1-adapter-helper", defaults: ["hidl-module-defaults"], @@ -134,6 +162,7 @@ genrule { cc_test { name: "android.hardware.power@1.1-adapter", + defaults: ["hidl-module-defaults"], shared_libs: [ "libhidladapter", "libhidlbase", diff --git a/power/1.1/Android.mk b/power/1.1/Android.mk deleted file mode 100644 index 5044cfa61..000000000 --- a/power/1.1/Android.mk +++ /dev/null @@ -1,84 +0,0 @@ -# This file is autogenerated by hidl-gen. Do not edit manually. - -LOCAL_PATH := $(call my-dir) - -################################################################################ - -include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.power-V1.1-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.hardware.power-V1.0-java \ - android.hidl.base-V1.0-java \ - -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES += core-oj hwbinder - -# -# Build types.hal (PowerStateSubsystem) -# -GEN := $(intermediates)/android/hardware/power/V1_1/PowerStateSubsystem.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.hardware:hardware/interfaces \ - -randroid.hidl:system/libhidl/transport \ - android.hardware.power@1.1::types.PowerStateSubsystem - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (PowerStateSubsystemSleepState) -# -GEN := $(intermediates)/android/hardware/power/V1_1/PowerStateSubsystemSleepState.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.hardware:hardware/interfaces \ - -randroid.hidl:system/libhidl/transport \ - android.hardware.power@1.1::types.PowerStateSubsystemSleepState - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build IPower.hal -# -GEN := $(intermediates)/android/hardware/power/V1_1/IPower.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IPower.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.hardware:hardware/interfaces \ - -randroid.hidl:system/libhidl/transport \ - android.hardware.power@1.1::IPower - -$(GEN): $(LOCAL_PATH)/IPower.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) -include $(BUILD_JAVA_LIBRARY) - - - -include $(call all-makefiles-under,$(LOCAL_PATH)) |