diff options
author | Steven Moreland <smoreland@google.com> | 2017-10-11 16:23:54 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-10-11 16:23:54 +0000 |
commit | 0fff75dee172d57536c2034e0a64f6d9bf0a0a7f (patch) | |
tree | e4e6555ec981cb590ca2237f052a514d4addbe81 /contexthub/1.0 | |
parent | 6d1326ed8a0564e4e521c3ef44ec795e2a520289 (diff) | |
parent | c3e80fa01ec895f1e0ba72ffb9ff48ec468e07b9 (diff) | |
download | platform_hardware_interfaces-0fff75dee172d57536c2034e0a64f6d9bf0a0a7f.tar.gz platform_hardware_interfaces-0fff75dee172d57536c2034e0a64f6d9bf0a0a7f.tar.bz2 platform_hardware_interfaces-0fff75dee172d57536c2034e0a64f6d9bf0a0a7f.zip |
Update for Soong java makefiles.
am: c3e80fa01e
Change-Id: Ia8835f9c95bd98a96f5fd3aff11191e7d3726fb9
Diffstat (limited to 'contexthub/1.0')
-rw-r--r-- | contexthub/1.0/Android.bp | 42 | ||||
-rw-r--r-- | contexthub/1.0/Android.mk | 334 |
2 files changed, 41 insertions, 335 deletions
diff --git a/contexthub/1.0/Android.bp b/contexthub/1.0/Android.bp index e8f7103a9e..93b3bf4491 100644 --- a/contexthub/1.0/Android.bp +++ b/contexthub/1.0/Android.bp @@ -73,6 +73,47 @@ cc_library { } genrule { + name: "android.hardware.contexthub-V1.0-java_gen_java", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.contexthub@1.0", + srcs: [ + ":android.hardware.contexthub@1.0_hal", + ], + out: [ + "android/hardware/contexthub/V1_0/AsyncEventType.java", + "android/hardware/contexthub/V1_0/ContextHub.java", + "android/hardware/contexthub/V1_0/ContextHubMsg.java", + "android/hardware/contexthub/V1_0/HostEndPoint.java", + "android/hardware/contexthub/V1_0/HubAppInfo.java", + "android/hardware/contexthub/V1_0/HubMemoryFlag.java", + "android/hardware/contexthub/V1_0/HubMemoryType.java", + "android/hardware/contexthub/V1_0/MemRange.java", + "android/hardware/contexthub/V1_0/NanoAppBinary.java", + "android/hardware/contexthub/V1_0/NanoAppFlags.java", + "android/hardware/contexthub/V1_0/PhysicalSensor.java", + "android/hardware/contexthub/V1_0/Result.java", + "android/hardware/contexthub/V1_0/SensorType.java", + "android/hardware/contexthub/V1_0/TransactionResult.java", + "android/hardware/contexthub/V1_0/IContexthub.java", + "android/hardware/contexthub/V1_0/IContexthubCallback.java", + ], +} + +java_library { + name: "android.hardware.contexthub-V1.0-java", + no_framework_libs: true, + defaults: ["hidl-java-module-defaults"], + srcs: [":android.hardware.contexthub-V1.0-java_gen_java"], + libs: [ + "hwbinder", + "android.hidl.base-V1.0-java", + ] +} + +// This package does not export any types. Not creating java constants export. + + +genrule { name: "android.hardware.contexthub@1.0-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.contexthub@1.0", @@ -98,7 +139,6 @@ genrule { ], } - cc_library { name: "android.hardware.contexthub@1.0-adapter-helper", defaults: ["hidl-module-defaults"], diff --git a/contexthub/1.0/Android.mk b/contexthub/1.0/Android.mk deleted file mode 100644 index 47bfd8fca9..0000000000 --- a/contexthub/1.0/Android.mk +++ /dev/null @@ -1,334 +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.contexthub-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 \ - -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES += core-oj hwbinder - -# -# Build types.hal (AsyncEventType) -# -GEN := $(intermediates)/android/hardware/contexthub/V1_0/AsyncEventType.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.contexthub@1.0::types.AsyncEventType - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (ContextHub) -# -GEN := $(intermediates)/android/hardware/contexthub/V1_0/ContextHub.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.contexthub@1.0::types.ContextHub - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (ContextHubMsg) -# -GEN := $(intermediates)/android/hardware/contexthub/V1_0/ContextHubMsg.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.contexthub@1.0::types.ContextHubMsg - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (HostEndPoint) -# -GEN := $(intermediates)/android/hardware/contexthub/V1_0/HostEndPoint.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.contexthub@1.0::types.HostEndPoint - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (HubAppInfo) -# -GEN := $(intermediates)/android/hardware/contexthub/V1_0/HubAppInfo.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.contexthub@1.0::types.HubAppInfo - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (HubMemoryFlag) -# -GEN := $(intermediates)/android/hardware/contexthub/V1_0/HubMemoryFlag.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.contexthub@1.0::types.HubMemoryFlag - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (HubMemoryType) -# -GEN := $(intermediates)/android/hardware/contexthub/V1_0/HubMemoryType.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.contexthub@1.0::types.HubMemoryType - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (MemRange) -# -GEN := $(intermediates)/android/hardware/contexthub/V1_0/MemRange.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.contexthub@1.0::types.MemRange - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (NanoAppBinary) -# -GEN := $(intermediates)/android/hardware/contexthub/V1_0/NanoAppBinary.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.contexthub@1.0::types.NanoAppBinary - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (NanoAppFlags) -# -GEN := $(intermediates)/android/hardware/contexthub/V1_0/NanoAppFlags.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.contexthub@1.0::types.NanoAppFlags - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (PhysicalSensor) -# -GEN := $(intermediates)/android/hardware/contexthub/V1_0/PhysicalSensor.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.contexthub@1.0::types.PhysicalSensor - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (Result) -# -GEN := $(intermediates)/android/hardware/contexthub/V1_0/Result.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.contexthub@1.0::types.Result - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (SensorType) -# -GEN := $(intermediates)/android/hardware/contexthub/V1_0/SensorType.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.contexthub@1.0::types.SensorType - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (TransactionResult) -# -GEN := $(intermediates)/android/hardware/contexthub/V1_0/TransactionResult.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.contexthub@1.0::types.TransactionResult - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build IContexthub.hal -# -GEN := $(intermediates)/android/hardware/contexthub/V1_0/IContexthub.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IContexthub.hal -$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IContexthubCallback.hal -$(GEN): $(LOCAL_PATH)/IContexthubCallback.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.contexthub@1.0::IContexthub - -$(GEN): $(LOCAL_PATH)/IContexthub.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build IContexthubCallback.hal -# -GEN := $(intermediates)/android/hardware/contexthub/V1_0/IContexthubCallback.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IContexthubCallback.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.contexthub@1.0::IContexthubCallback - -$(GEN): $(LOCAL_PATH)/IContexthubCallback.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) -include $(BUILD_JAVA_LIBRARY) - - - -include $(call all-makefiles-under,$(LOCAL_PATH)) |