diff options
author | Steven Moreland <smoreland@google.com> | 2017-11-01 16:42:15 -0700 |
---|---|---|
committer | Steven Moreland <smoreland@google.com> | 2017-11-01 16:42:15 -0700 |
commit | c5bc4c7cbb435baa852fa0cc71d8230e062cd3dd (patch) | |
tree | 56c8e5fc5fb7b396c95822d4f0be07645c8b95d1 /vibrator/1.1 | |
parent | aaa67596dff0833f124bd111da746e39c5c5bcec (diff) | |
download | android_hardware_interfaces-c5bc4c7cbb435baa852fa0cc71d8230e062cd3dd.tar.gz android_hardware_interfaces-c5bc4c7cbb435baa852fa0cc71d8230e062cd3dd.tar.bz2 android_hardware_interfaces-c5bc4c7cbb435baa852fa0cc71d8230e062cd3dd.zip |
Update makefiles after AOSP push.
Test: none
Change-Id: If3ce74f4d2250d33820cbd864ff56bba6f9e6b67
Diffstat (limited to 'vibrator/1.1')
-rw-r--r-- | vibrator/1.1/Android.bp | 123 | ||||
-rw-r--r-- | vibrator/1.1/Android.mk | 99 |
2 files changed, 123 insertions, 99 deletions
diff --git a/vibrator/1.1/Android.bp b/vibrator/1.1/Android.bp index a47f37c9a..11985fda6 100644 --- a/vibrator/1.1/Android.bp +++ b/vibrator/1.1/Android.bp @@ -66,3 +66,126 @@ cc_library { "android.hardware.vibrator@1.0", ], } + +genrule { + name: "android.hardware.vibrator-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.vibrator@1.1", + srcs: [ + ":android.hardware.vibrator@1.1_hal", + ], + out: [ + "android/hardware/vibrator/V1_1/Effect_1_1.java", + "android/hardware/vibrator/V1_1/IVibrator.java", + ], +} + +java_library { + name: "android.hardware.vibrator-V1.1-java", + no_framework_libs: true, + defaults: ["hidl-java-module-defaults"], + srcs: [":android.hardware.vibrator-V1.1-java_gen_java"], + libs: [ + "hwbinder", + "android.hardware.vibrator-V1.0-java", + "android.hidl.base-V1.0-java", + ] +} + +genrule { + name: "android.hardware.vibrator-V1.1-java-constants_gen_java", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Ljava-constants -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.1", + srcs: [ + ":android.hardware.vibrator@1.1_hal", + ], + out: [ + "android/hardware/vibrator/V1_1/Constants.java", + ], +} + +java_library { + name: "android.hardware.vibrator-V1.1-java-constants", + no_framework_libs: true, + defaults: ["hidl-java-module-defaults"], + srcs: [":android.hardware.vibrator-V1.1-java-constants_gen_java"], +} + +genrule { + name: "android.hardware.vibrator@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.vibrator@1.1", + srcs: [ + ":android.hardware.vibrator@1.1_hal", + ], + out: [ + "android/hardware/vibrator/1.1/AVibrator.cpp", + ], +} + +genrule { + name: "android.hardware.vibrator@1.1-adapter-helper_genc++_headers", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.1", + srcs: [ + ":android.hardware.vibrator@1.1_hal", + ], + out: [ + "android/hardware/vibrator/1.1/AVibrator.h", + ], +} + +cc_library { + name: "android.hardware.vibrator@1.1-adapter-helper", + defaults: ["hidl-module-defaults"], + generated_sources: ["android.hardware.vibrator@1.1-adapter-helper_genc++"], + generated_headers: ["android.hardware.vibrator@1.1-adapter-helper_genc++_headers"], + export_generated_headers: ["android.hardware.vibrator@1.1-adapter-helper_genc++_headers"], + vendor_available: true, + shared_libs: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "liblog", + "libutils", + "libcutils", + "libhidladapter", + "android.hardware.vibrator@1.0", + "android.hardware.vibrator@1.1", + "android.hardware.vibrator@1.0-adapter-helper", + "android.hidl.base@1.0-adapter-helper", + ], + export_shared_lib_headers: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "libutils", + "libhidladapter", + "android.hardware.vibrator@1.0", + "android.hardware.vibrator@1.1", + "android.hardware.vibrator@1.0-adapter-helper", + "android.hidl.base@1.0-adapter-helper", + ], +} + +genrule { + name: "android.hardware.vibrator@1.1-adapter_genc++", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.vibrator@1.1", + out: ["main.cpp"] +} + +cc_test { + name: "android.hardware.vibrator@1.1-adapter", + defaults: ["hidl-module-defaults"], + shared_libs: [ + "libhidladapter", + "libhidlbase", + "libhidltransport", + "libutils", + "android.hardware.vibrator@1.0", + "android.hardware.vibrator@1.1", + "android.hardware.vibrator@1.1-adapter-helper", + ], + generated_sources: ["android.hardware.vibrator@1.1-adapter_genc++"], +} diff --git a/vibrator/1.1/Android.mk b/vibrator/1.1/Android.mk deleted file mode 100644 index d08f8376d..000000000 --- a/vibrator/1.1/Android.mk +++ /dev/null @@ -1,99 +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.vibrator-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.vibrator-V1.0-java \ - android.hidl.base-V1.0-java \ - -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES += core-oj hwbinder - -# -# Build types.hal (Effect_1_1) -# -GEN := $(intermediates)/android/hardware/vibrator/V1_1/Effect_1_1.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.vibrator@1.1::types.Effect_1_1 - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build IVibrator.hal -# -GEN := $(intermediates)/android/hardware/vibrator/V1_1/IVibrator.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IVibrator.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.vibrator@1.1::IVibrator - -$(GEN): $(LOCAL_PATH)/IVibrator.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) -include $(BUILD_JAVA_LIBRARY) - - -################################################################################ - -include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.vibrator-V1.1-java-constants -LOCAL_MODULE_CLASS := JAVA_LIBRARIES - -intermediates := $(call local-generated-sources-dir, COMMON) - -HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) -# -GEN := $(intermediates)/android/hardware/vibrator/V1_1/Constants.java -$(GEN): $(HIDL) -$(GEN): $(LOCAL_PATH)/types.hal -$(GEN): $(LOCAL_PATH)/IVibrator.hal - -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) -$(GEN): PRIVATE_CUSTOM_TOOL = \ - $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ - -Ljava-constants \ - -randroid.hardware:hardware/interfaces \ - -randroid.hidl:system/libhidl/transport \ - android.hardware.vibrator@1.1 - -$(GEN): - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) -# Avoid dependency cycle of framework.jar -> this-library -> framework.jar -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core-oj - -include $(BUILD_STATIC_JAVA_LIBRARY) - - - -include $(call all-makefiles-under,$(LOCAL_PATH)) |