diff options
32 files changed, 655 insertions, 2270 deletions
diff --git a/automotive/evs/1.0/Android.bp b/automotive/evs/1.0/Android.bp index da68c2a51..fa5fac090 100644 --- a/automotive/evs/1.0/Android.bp +++ b/automotive/evs/1.0/Android.bp @@ -86,6 +86,11 @@ cc_library { ], } +// This package is not java compatible. Not creating java target. + +// This package does not export any types. Not creating java constants export. + + genrule { name: "android.hardware.automotive.evs@1.0-adapter-helper_genc++", tools: ["hidl-gen"], @@ -116,7 +121,6 @@ genrule { ], } - cc_library { name: "android.hardware.automotive.evs@1.0-adapter-helper", defaults: ["hidl-module-defaults"], diff --git a/automotive/vehicle/2.0/Android.bp b/automotive/vehicle/2.0/Android.bp index 0d0d28f9a..10f99b1e1 100644 --- a/automotive/vehicle/2.0/Android.bp +++ b/automotive/vehicle/2.0/Android.bp @@ -73,6 +73,97 @@ cc_library { } genrule { + name: "android.hardware.automotive.vehicle-V2.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.automotive.vehicle@2.0", + srcs: [ + ":android.hardware.automotive.vehicle@2.0_hal", + ], + out: [ + "android/hardware/automotive/vehicle/V2_0/DiagnosticFloatSensorIndex.java", + "android/hardware/automotive/vehicle/V2_0/DiagnosticIntegerSensorIndex.java", + "android/hardware/automotive/vehicle/V2_0/Obd2CommonIgnitionMonitors.java", + "android/hardware/automotive/vehicle/V2_0/Obd2CompressionIgnitionMonitors.java", + "android/hardware/automotive/vehicle/V2_0/Obd2FuelSystemStatus.java", + "android/hardware/automotive/vehicle/V2_0/Obd2FuelType.java", + "android/hardware/automotive/vehicle/V2_0/Obd2IgnitionMonitorKind.java", + "android/hardware/automotive/vehicle/V2_0/Obd2SecondaryAirStatus.java", + "android/hardware/automotive/vehicle/V2_0/Obd2SparkIgnitionMonitors.java", + "android/hardware/automotive/vehicle/V2_0/StatusCode.java", + "android/hardware/automotive/vehicle/V2_0/SubscribeFlags.java", + "android/hardware/automotive/vehicle/V2_0/SubscribeOptions.java", + "android/hardware/automotive/vehicle/V2_0/VehicleApPowerBootupReason.java", + "android/hardware/automotive/vehicle/V2_0/VehicleApPowerSetState.java", + "android/hardware/automotive/vehicle/V2_0/VehicleApPowerState.java", + "android/hardware/automotive/vehicle/V2_0/VehicleApPowerStateConfigFlag.java", + "android/hardware/automotive/vehicle/V2_0/VehicleApPowerStateIndex.java", + "android/hardware/automotive/vehicle/V2_0/VehicleApPowerStateShutdownParam.java", + "android/hardware/automotive/vehicle/V2_0/VehicleArea.java", + "android/hardware/automotive/vehicle/V2_0/VehicleAreaConfig.java", + "android/hardware/automotive/vehicle/V2_0/VehicleAreaDoor.java", + "android/hardware/automotive/vehicle/V2_0/VehicleAreaMirror.java", + "android/hardware/automotive/vehicle/V2_0/VehicleAreaSeat.java", + "android/hardware/automotive/vehicle/V2_0/VehicleAreaWindow.java", + "android/hardware/automotive/vehicle/V2_0/VehicleAreaZone.java", + "android/hardware/automotive/vehicle/V2_0/VehicleAudioContextFlag.java", + "android/hardware/automotive/vehicle/V2_0/VehicleAudioExtFocusFlag.java", + "android/hardware/automotive/vehicle/V2_0/VehicleAudioFocusIndex.java", + "android/hardware/automotive/vehicle/V2_0/VehicleAudioFocusRequest.java", + "android/hardware/automotive/vehicle/V2_0/VehicleAudioFocusState.java", + "android/hardware/automotive/vehicle/V2_0/VehicleAudioHwVariantConfigFlag.java", + "android/hardware/automotive/vehicle/V2_0/VehicleAudioRoutingPolicyIndex.java", + "android/hardware/automotive/vehicle/V2_0/VehicleAudioStream.java", + "android/hardware/automotive/vehicle/V2_0/VehicleAudioStreamFlag.java", + "android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeCapabilityFlag.java", + "android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeIndex.java", + "android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeLimitIndex.java", + "android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeState.java", + "android/hardware/automotive/vehicle/V2_0/VehicleDisplay.java", + "android/hardware/automotive/vehicle/V2_0/VehicleDrivingStatus.java", + "android/hardware/automotive/vehicle/V2_0/VehicleGear.java", + "android/hardware/automotive/vehicle/V2_0/VehicleHvacFanDirection.java", + "android/hardware/automotive/vehicle/V2_0/VehicleHwKeyInputAction.java", + "android/hardware/automotive/vehicle/V2_0/VehicleIgnitionState.java", + "android/hardware/automotive/vehicle/V2_0/VehicleInstrumentClusterType.java", + "android/hardware/automotive/vehicle/V2_0/VehiclePropConfig.java", + "android/hardware/automotive/vehicle/V2_0/VehiclePropValue.java", + "android/hardware/automotive/vehicle/V2_0/VehicleProperty.java", + "android/hardware/automotive/vehicle/V2_0/VehiclePropertyAccess.java", + "android/hardware/automotive/vehicle/V2_0/VehiclePropertyChangeMode.java", + "android/hardware/automotive/vehicle/V2_0/VehiclePropertyGroup.java", + "android/hardware/automotive/vehicle/V2_0/VehiclePropertyOperation.java", + "android/hardware/automotive/vehicle/V2_0/VehiclePropertyType.java", + "android/hardware/automotive/vehicle/V2_0/VehicleRadioConstants.java", + "android/hardware/automotive/vehicle/V2_0/VehicleTurnSignal.java", + "android/hardware/automotive/vehicle/V2_0/VehicleUnit.java", + "android/hardware/automotive/vehicle/V2_0/VmsAvailabilityStateIntegerValuesIndex.java", + "android/hardware/automotive/vehicle/V2_0/VmsBaseMessageIntegerValuesIndex.java", + "android/hardware/automotive/vehicle/V2_0/VmsMessageType.java", + "android/hardware/automotive/vehicle/V2_0/VmsMessageWithLayerAndPublisherIdIntegerValuesIndex.java", + "android/hardware/automotive/vehicle/V2_0/VmsMessageWithLayerIntegerValuesIndex.java", + "android/hardware/automotive/vehicle/V2_0/VmsOfferingMessageIntegerValuesIndex.java", + "android/hardware/automotive/vehicle/V2_0/VmsSubscriptionsStateIntegerValuesIndex.java", + "android/hardware/automotive/vehicle/V2_0/Wheel.java", + "android/hardware/automotive/vehicle/V2_0/IVehicle.java", + "android/hardware/automotive/vehicle/V2_0/IVehicleCallback.java", + ], +} + +java_library { + name: "android.hardware.automotive.vehicle-V2.0-java", + no_framework_libs: true, + defaults: ["hidl-java-module-defaults"], + srcs: [":android.hardware.automotive.vehicle-V2.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.automotive.vehicle@2.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.automotive.vehicle@2.0", @@ -98,7 +189,6 @@ genrule { ], } - cc_library { name: "android.hardware.automotive.vehicle@2.0-adapter-helper", defaults: ["hidl-module-defaults"], diff --git a/automotive/vehicle/2.0/Android.mk b/automotive/vehicle/2.0/Android.mk deleted file mode 100644 index ec18766a6..000000000 --- a/automotive/vehicle/2.0/Android.mk +++ /dev/null @@ -1,1284 +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.automotive.vehicle-V2.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 (DiagnosticFloatSensorIndex) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/DiagnosticFloatSensorIndex.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.automotive.vehicle@2.0::types.DiagnosticFloatSensorIndex - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (DiagnosticIntegerSensorIndex) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/DiagnosticIntegerSensorIndex.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.automotive.vehicle@2.0::types.DiagnosticIntegerSensorIndex - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (Obd2CommonIgnitionMonitors) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2CommonIgnitionMonitors.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.automotive.vehicle@2.0::types.Obd2CommonIgnitionMonitors - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (Obd2CompressionIgnitionMonitors) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2CompressionIgnitionMonitors.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.automotive.vehicle@2.0::types.Obd2CompressionIgnitionMonitors - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (Obd2FuelSystemStatus) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2FuelSystemStatus.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.automotive.vehicle@2.0::types.Obd2FuelSystemStatus - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (Obd2FuelType) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2FuelType.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.automotive.vehicle@2.0::types.Obd2FuelType - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (Obd2IgnitionMonitorKind) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2IgnitionMonitorKind.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.automotive.vehicle@2.0::types.Obd2IgnitionMonitorKind - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (Obd2SecondaryAirStatus) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2SecondaryAirStatus.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.automotive.vehicle@2.0::types.Obd2SecondaryAirStatus - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (Obd2SparkIgnitionMonitors) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2SparkIgnitionMonitors.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.automotive.vehicle@2.0::types.Obd2SparkIgnitionMonitors - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (StatusCode) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/StatusCode.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.automotive.vehicle@2.0::types.StatusCode - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (SubscribeFlags) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/SubscribeFlags.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.automotive.vehicle@2.0::types.SubscribeFlags - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (SubscribeOptions) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/SubscribeOptions.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.automotive.vehicle@2.0::types.SubscribeOptions - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehicleApPowerBootupReason) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleApPowerBootupReason.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.automotive.vehicle@2.0::types.VehicleApPowerBootupReason - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehicleApPowerSetState) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleApPowerSetState.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.automotive.vehicle@2.0::types.VehicleApPowerSetState - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehicleApPowerState) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleApPowerState.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.automotive.vehicle@2.0::types.VehicleApPowerState - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehicleApPowerStateConfigFlag) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleApPowerStateConfigFlag.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.automotive.vehicle@2.0::types.VehicleApPowerStateConfigFlag - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehicleApPowerStateIndex) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleApPowerStateIndex.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.automotive.vehicle@2.0::types.VehicleApPowerStateIndex - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehicleApPowerStateShutdownParam) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleApPowerStateShutdownParam.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.automotive.vehicle@2.0::types.VehicleApPowerStateShutdownParam - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehicleArea) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleArea.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.automotive.vehicle@2.0::types.VehicleArea - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehicleAreaConfig) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAreaConfig.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.automotive.vehicle@2.0::types.VehicleAreaConfig - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehicleAreaDoor) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAreaDoor.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.automotive.vehicle@2.0::types.VehicleAreaDoor - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehicleAreaMirror) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAreaMirror.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.automotive.vehicle@2.0::types.VehicleAreaMirror - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehicleAreaSeat) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAreaSeat.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.automotive.vehicle@2.0::types.VehicleAreaSeat - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehicleAreaWindow) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAreaWindow.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.automotive.vehicle@2.0::types.VehicleAreaWindow - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehicleAreaZone) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAreaZone.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.automotive.vehicle@2.0::types.VehicleAreaZone - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehicleAudioContextFlag) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioContextFlag.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.automotive.vehicle@2.0::types.VehicleAudioContextFlag - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehicleAudioExtFocusFlag) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioExtFocusFlag.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.automotive.vehicle@2.0::types.VehicleAudioExtFocusFlag - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehicleAudioFocusIndex) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioFocusIndex.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.automotive.vehicle@2.0::types.VehicleAudioFocusIndex - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehicleAudioFocusRequest) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioFocusRequest.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.automotive.vehicle@2.0::types.VehicleAudioFocusRequest - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehicleAudioFocusState) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioFocusState.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.automotive.vehicle@2.0::types.VehicleAudioFocusState - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehicleAudioHwVariantConfigFlag) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioHwVariantConfigFlag.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.automotive.vehicle@2.0::types.VehicleAudioHwVariantConfigFlag - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehicleAudioRoutingPolicyIndex) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioRoutingPolicyIndex.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.automotive.vehicle@2.0::types.VehicleAudioRoutingPolicyIndex - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehicleAudioStream) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioStream.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.automotive.vehicle@2.0::types.VehicleAudioStream - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehicleAudioStreamFlag) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioStreamFlag.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.automotive.vehicle@2.0::types.VehicleAudioStreamFlag - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehicleAudioVolumeCapabilityFlag) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeCapabilityFlag.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.automotive.vehicle@2.0::types.VehicleAudioVolumeCapabilityFlag - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehicleAudioVolumeIndex) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeIndex.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.automotive.vehicle@2.0::types.VehicleAudioVolumeIndex - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehicleAudioVolumeLimitIndex) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeLimitIndex.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.automotive.vehicle@2.0::types.VehicleAudioVolumeLimitIndex - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehicleAudioVolumeState) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeState.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.automotive.vehicle@2.0::types.VehicleAudioVolumeState - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehicleDisplay) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleDisplay.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.automotive.vehicle@2.0::types.VehicleDisplay - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehicleDrivingStatus) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleDrivingStatus.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.automotive.vehicle@2.0::types.VehicleDrivingStatus - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehicleGear) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleGear.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.automotive.vehicle@2.0::types.VehicleGear - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehicleHvacFanDirection) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleHvacFanDirection.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.automotive.vehicle@2.0::types.VehicleHvacFanDirection - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehicleHwKeyInputAction) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleHwKeyInputAction.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.automotive.vehicle@2.0::types.VehicleHwKeyInputAction - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehicleIgnitionState) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleIgnitionState.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.automotive.vehicle@2.0::types.VehicleIgnitionState - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehicleInstrumentClusterType) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleInstrumentClusterType.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.automotive.vehicle@2.0::types.VehicleInstrumentClusterType - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehiclePropConfig) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropConfig.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.automotive.vehicle@2.0::types.VehiclePropConfig - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehiclePropValue) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropValue.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.automotive.vehicle@2.0::types.VehiclePropValue - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehicleProperty) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleProperty.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.automotive.vehicle@2.0::types.VehicleProperty - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehiclePropertyAccess) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropertyAccess.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.automotive.vehicle@2.0::types.VehiclePropertyAccess - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehiclePropertyChangeMode) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropertyChangeMode.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.automotive.vehicle@2.0::types.VehiclePropertyChangeMode - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehiclePropertyGroup) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropertyGroup.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.automotive.vehicle@2.0::types.VehiclePropertyGroup - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehiclePropertyOperation) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropertyOperation.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.automotive.vehicle@2.0::types.VehiclePropertyOperation - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehiclePropertyType) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropertyType.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.automotive.vehicle@2.0::types.VehiclePropertyType - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehicleRadioConstants) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleRadioConstants.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.automotive.vehicle@2.0::types.VehicleRadioConstants - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehicleTurnSignal) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleTurnSignal.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.automotive.vehicle@2.0::types.VehicleTurnSignal - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VehicleUnit) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleUnit.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.automotive.vehicle@2.0::types.VehicleUnit - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VmsAvailabilityStateIntegerValuesIndex) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsAvailabilityStateIntegerValuesIndex.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.automotive.vehicle@2.0::types.VmsAvailabilityStateIntegerValuesIndex - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VmsBaseMessageIntegerValuesIndex) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsBaseMessageIntegerValuesIndex.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.automotive.vehicle@2.0::types.VmsBaseMessageIntegerValuesIndex - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VmsMessageType) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsMessageType.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.automotive.vehicle@2.0::types.VmsMessageType - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VmsMessageWithLayerAndPublisherIdIntegerValuesIndex) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsMessageWithLayerAndPublisherIdIntegerValuesIndex.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.automotive.vehicle@2.0::types.VmsMessageWithLayerAndPublisherIdIntegerValuesIndex - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VmsMessageWithLayerIntegerValuesIndex) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsMessageWithLayerIntegerValuesIndex.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.automotive.vehicle@2.0::types.VmsMessageWithLayerIntegerValuesIndex - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VmsOfferingMessageIntegerValuesIndex) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsOfferingMessageIntegerValuesIndex.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.automotive.vehicle@2.0::types.VmsOfferingMessageIntegerValuesIndex - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (VmsSubscriptionsStateIntegerValuesIndex) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsSubscriptionsStateIntegerValuesIndex.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.automotive.vehicle@2.0::types.VmsSubscriptionsStateIntegerValuesIndex - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (Wheel) -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Wheel.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.automotive.vehicle@2.0::types.Wheel - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build IVehicle.hal -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/IVehicle.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IVehicle.hal -$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IVehicleCallback.hal -$(GEN): $(LOCAL_PATH)/IVehicleCallback.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.automotive.vehicle@2.0::IVehicle - -$(GEN): $(LOCAL_PATH)/IVehicle.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build IVehicleCallback.hal -# -GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/IVehicleCallback.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IVehicleCallback.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.automotive.vehicle@2.0::IVehicleCallback - -$(GEN): $(LOCAL_PATH)/IVehicleCallback.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) -include $(BUILD_JAVA_LIBRARY) - - - -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/broadcastradio/1.2/Android.bp b/broadcastradio/1.2/Android.bp index 44136c8a2..1a7f90424 100644 --- a/broadcastradio/1.2/Android.bp +++ b/broadcastradio/1.2/Android.bp @@ -82,3 +82,96 @@ cc_library { "android.hardware.broadcastradio@1.1", ], } + +// This package is not java compatible. Not creating java target. + +// This package does not export any types. Not creating java constants export. + + +genrule { + name: "android.hardware.broadcastradio@1.2-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.broadcastradio@1.2", + srcs: [ + ":android.hardware.broadcastradio@1.2_hal", + ], + out: [ + "android/hardware/broadcastradio/1.2/ABroadcastRadioFactory.cpp", + "android/hardware/broadcastradio/1.2/ATuner.cpp", + "android/hardware/broadcastradio/1.2/ATunerCallback.cpp", + ], +} + +genrule { + name: "android.hardware.broadcastradio@1.2-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.broadcastradio@1.2", + srcs: [ + ":android.hardware.broadcastradio@1.2_hal", + ], + out: [ + "android/hardware/broadcastradio/1.2/ABroadcastRadioFactory.h", + "android/hardware/broadcastradio/1.2/ATuner.h", + "android/hardware/broadcastradio/1.2/ATunerCallback.h", + ], +} + +cc_library { + name: "android.hardware.broadcastradio@1.2-adapter-helper", + defaults: ["hidl-module-defaults"], + generated_sources: ["android.hardware.broadcastradio@1.2-adapter-helper_genc++"], + generated_headers: ["android.hardware.broadcastradio@1.2-adapter-helper_genc++_headers"], + export_generated_headers: ["android.hardware.broadcastradio@1.2-adapter-helper_genc++_headers"], + vendor_available: true, + shared_libs: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "liblog", + "libutils", + "libcutils", + "libhidladapter", + "android.hardware.broadcastradio@1.0", + "android.hardware.broadcastradio@1.1", + "android.hardware.broadcastradio@1.2", + "android.hardware.broadcastradio@1.0-adapter-helper", + "android.hardware.broadcastradio@1.1-adapter-helper", + "android.hidl.base@1.0-adapter-helper", + ], + export_shared_lib_headers: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "libutils", + "libhidladapter", + "android.hardware.broadcastradio@1.0", + "android.hardware.broadcastradio@1.1", + "android.hardware.broadcastradio@1.2", + "android.hardware.broadcastradio@1.0-adapter-helper", + "android.hardware.broadcastradio@1.1-adapter-helper", + "android.hidl.base@1.0-adapter-helper", + ], +} + +genrule { + name: "android.hardware.broadcastradio@1.2-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.broadcastradio@1.2", + out: ["main.cpp"] +} + +cc_test { + name: "android.hardware.broadcastradio@1.2-adapter", + defaults: ["hidl-module-defaults"], + shared_libs: [ + "libhidladapter", + "libhidlbase", + "libhidltransport", + "libutils", + "android.hardware.broadcastradio@1.0", + "android.hardware.broadcastradio@1.1", + "android.hardware.broadcastradio@1.2", + "android.hardware.broadcastradio@1.2-adapter-helper", + ], + generated_sources: ["android.hardware.broadcastradio@1.2-adapter_genc++"], +} diff --git a/camera/device/3.3/Android.bp b/camera/device/3.3/Android.bp index 29b63f834..af3d7b4cd 100644 --- a/camera/device/3.3/Android.bp +++ b/camera/device/3.3/Android.bp @@ -71,6 +71,11 @@ cc_library { ], } +// This package is not java compatible. Not creating java target. + +// This package does not export any types. Not creating java constants export. + + genrule { name: "android.hardware.camera.device@3.3-adapter-helper_genc++", tools: ["hidl-gen"], @@ -95,7 +100,6 @@ genrule { ], } - cc_library { name: "android.hardware.camera.device@3.3-adapter-helper", defaults: ["hidl-module-defaults"], @@ -142,6 +146,7 @@ genrule { cc_test { name: "android.hardware.camera.device@3.3-adapter", + defaults: ["hidl-module-defaults"], shared_libs: [ "libhidladapter", "libhidlbase", diff --git a/cas/1.0/Android.bp b/cas/1.0/Android.bp index ea8c10ee1..80610f977 100644 --- a/cas/1.0/Android.bp +++ b/cas/1.0/Android.bp @@ -87,6 +87,37 @@ cc_library { } genrule { + name: "android.hardware.cas-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.cas@1.0", + srcs: [ + ":android.hardware.cas@1.0_hal", + ], + out: [ + "android/hardware/cas/V1_0/HidlCasPluginDescriptor.java", + "android/hardware/cas/V1_0/Status.java", + "android/hardware/cas/V1_0/ICas.java", + "android/hardware/cas/V1_0/ICasListener.java", + "android/hardware/cas/V1_0/IDescramblerBase.java", + "android/hardware/cas/V1_0/IMediaCasService.java", + ], +} + +java_library { + name: "android.hardware.cas-V1.0-java", + no_framework_libs: true, + defaults: ["hidl-java-module-defaults"], + srcs: [":android.hardware.cas-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.cas@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.cas@1.0", @@ -116,7 +147,6 @@ genrule { ], } - cc_library { name: "android.hardware.cas@1.0-adapter-helper", defaults: ["hidl-module-defaults"], @@ -155,6 +185,7 @@ genrule { cc_test { name: "android.hardware.cas@1.0-adapter", + defaults: ["hidl-module-defaults"], shared_libs: [ "libhidladapter", "libhidlbase", diff --git a/cas/1.0/Android.mk b/cas/1.0/Android.mk deleted file mode 100644 index 1ff2b04de..000000000 --- a/cas/1.0/Android.mk +++ /dev/null @@ -1,150 +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.cas-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 (HidlCasPluginDescriptor) -# -GEN := $(intermediates)/android/hardware/cas/V1_0/HidlCasPluginDescriptor.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.cas@1.0::types.HidlCasPluginDescriptor - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (Status) -# -GEN := $(intermediates)/android/hardware/cas/V1_0/Status.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.cas@1.0::types.Status - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build ICas.hal -# -GEN := $(intermediates)/android/hardware/cas/V1_0/ICas.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ICas.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.cas@1.0::ICas - -$(GEN): $(LOCAL_PATH)/ICas.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build ICasListener.hal -# -GEN := $(intermediates)/android/hardware/cas/V1_0/ICasListener.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ICasListener.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.cas@1.0::ICasListener - -$(GEN): $(LOCAL_PATH)/ICasListener.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build IDescramblerBase.hal -# -GEN := $(intermediates)/android/hardware/cas/V1_0/IDescramblerBase.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IDescramblerBase.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.cas@1.0::IDescramblerBase - -$(GEN): $(LOCAL_PATH)/IDescramblerBase.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build IMediaCasService.hal -# -GEN := $(intermediates)/android/hardware/cas/V1_0/IMediaCasService.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IMediaCasService.hal -$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ICas.hal -$(GEN): $(LOCAL_PATH)/ICas.hal -$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ICasListener.hal -$(GEN): $(LOCAL_PATH)/ICasListener.hal -$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IDescramblerBase.hal -$(GEN): $(LOCAL_PATH)/IDescramblerBase.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.cas@1.0::IMediaCasService - -$(GEN): $(LOCAL_PATH)/IMediaCasService.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) -include $(BUILD_JAVA_LIBRARY) - - - -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/cas/native/1.0/Android.bp b/cas/native/1.0/Android.bp index 4b5472a8d..65bd7fbe5 100644 --- a/cas/native/1.0/Android.bp +++ b/cas/native/1.0/Android.bp @@ -67,6 +67,11 @@ cc_library { ], } +// This package is not java compatible. Not creating java target. + +// This package does not export any types. Not creating java constants export. + + genrule { name: "android.hardware.cas.native@1.0-adapter-helper_genc++", tools: ["hidl-gen"], @@ -91,7 +96,6 @@ genrule { ], } - cc_library { name: "android.hardware.cas.native@1.0-adapter-helper", defaults: ["hidl-module-defaults"], @@ -134,6 +138,7 @@ genrule { cc_test { name: "android.hardware.cas.native@1.0-adapter", + defaults: ["hidl-module-defaults"], shared_libs: [ "libhidladapter", "libhidlbase", diff --git a/configstore/1.1/Android.bp b/configstore/1.1/Android.bp index 1bddc6c48..3f8d58015 100644 --- a/configstore/1.1/Android.bp +++ b/configstore/1.1/Android.bp @@ -64,6 +64,33 @@ cc_library { } genrule { + name: "android.hardware.configstore-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.configstore@1.1", + srcs: [ + ":android.hardware.configstore@1.1_hal", + ], + out: [ + "android/hardware/configstore/V1_1/ISurfaceFlingerConfigs.java", + ], +} + +java_library { + name: "android.hardware.configstore-V1.1-java", + no_framework_libs: true, + defaults: ["hidl-java-module-defaults"], + srcs: [":android.hardware.configstore-V1.1-java_gen_java"], + libs: [ + "hwbinder", + "android.hardware.configstore-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.configstore@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.configstore@1.1", @@ -87,7 +114,6 @@ genrule { ], } - cc_library { name: "android.hardware.configstore@1.1-adapter-helper", defaults: ["hidl-module-defaults"], @@ -130,6 +156,7 @@ genrule { cc_test { name: "android.hardware.configstore@1.1-adapter", + defaults: ["hidl-module-defaults"], shared_libs: [ "libhidladapter", "libhidlbase", diff --git a/configstore/1.1/Android.mk b/configstore/1.1/Android.mk deleted file mode 100644 index b3f7053cd..000000000 --- a/configstore/1.1/Android.mk +++ /dev/null @@ -1,44 +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.configstore-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.configstore-V1.0-java \ - android.hidl.base-V1.0-java \ - -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES += core-oj hwbinder - -# -# Build ISurfaceFlingerConfigs.hal -# -GEN := $(intermediates)/android/hardware/configstore/V1_1/ISurfaceFlingerConfigs.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISurfaceFlingerConfigs.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.configstore@1.1::ISurfaceFlingerConfigs - -$(GEN): $(LOCAL_PATH)/ISurfaceFlingerConfigs.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) -include $(BUILD_JAVA_LIBRARY) - - - -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/graphics/mapper/2.1/Android.bp b/graphics/mapper/2.1/Android.bp index 971cd9954..029fbbe64 100644 --- a/graphics/mapper/2.1/Android.bp +++ b/graphics/mapper/2.1/Android.bp @@ -66,6 +66,11 @@ cc_library { ], } +// This package is not java compatible. Not creating java target. + +// This package does not export any types. Not creating java constants export. + + genrule { name: "android.hardware.graphics.mapper@2.1-adapter-helper_genc++", tools: ["hidl-gen"], @@ -90,7 +95,6 @@ genrule { ], } - cc_library { name: "android.hardware.graphics.mapper@2.1-adapter-helper", defaults: ["hidl-module-defaults"], @@ -135,6 +139,7 @@ genrule { cc_test { name: "android.hardware.graphics.mapper@2.1-adapter", + defaults: ["hidl-module-defaults"], shared_libs: [ "libhidladapter", "libhidlbase", diff --git a/media/1.0/Android.mk b/media/1.0/Android.mk deleted file mode 100644 index bc44b9eea..000000000 --- a/media/1.0/Android.mk +++ /dev/null @@ -1,14 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -####################################### -# media_profiles_V1_0.dtd - -include $(CLEAR_VARS) - -LOCAL_MODULE := media_profiles_V1_0.dtd -LOCAL_SRC_FILES := media_profiles.dtd -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_PATH := $(TARGET_OUT_ETC) - -include $(BUILD_PREBUILT) - diff --git a/neuralnetworks/1.0/Android.bp b/neuralnetworks/1.0/Android.bp index ba32d0c39..26783e7ff 100644 --- a/neuralnetworks/1.0/Android.bp +++ b/neuralnetworks/1.0/Android.bp @@ -85,3 +85,88 @@ cc_library { "libutils", ], } + +// This package is not java compatible. Not creating java target. + +// This package does not export any types. Not creating java constants export. + + +genrule { + name: "android.hardware.neuralnetworks@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.neuralnetworks@1.0", + srcs: [ + ":android.hardware.neuralnetworks@1.0_hal", + ], + out: [ + "android/hardware/neuralnetworks/1.0/ADevice.cpp", + "android/hardware/neuralnetworks/1.0/AExecutionCallback.cpp", + "android/hardware/neuralnetworks/1.0/APreparedModel.cpp", + "android/hardware/neuralnetworks/1.0/APreparedModelCallback.cpp", + ], +} + +genrule { + name: "android.hardware.neuralnetworks@1.0-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.neuralnetworks@1.0", + srcs: [ + ":android.hardware.neuralnetworks@1.0_hal", + ], + out: [ + "android/hardware/neuralnetworks/1.0/ADevice.h", + "android/hardware/neuralnetworks/1.0/AExecutionCallback.h", + "android/hardware/neuralnetworks/1.0/APreparedModel.h", + "android/hardware/neuralnetworks/1.0/APreparedModelCallback.h", + ], +} + +cc_library { + name: "android.hardware.neuralnetworks@1.0-adapter-helper", + defaults: ["hidl-module-defaults"], + generated_sources: ["android.hardware.neuralnetworks@1.0-adapter-helper_genc++"], + generated_headers: ["android.hardware.neuralnetworks@1.0-adapter-helper_genc++_headers"], + export_generated_headers: ["android.hardware.neuralnetworks@1.0-adapter-helper_genc++_headers"], + vendor_available: true, + shared_libs: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "liblog", + "libutils", + "libcutils", + "libhidladapter", + "android.hardware.neuralnetworks@1.0", + "android.hidl.base@1.0-adapter-helper", + ], + export_shared_lib_headers: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "libutils", + "libhidladapter", + "android.hardware.neuralnetworks@1.0", + "android.hidl.base@1.0-adapter-helper", + ], +} + +genrule { + name: "android.hardware.neuralnetworks@1.0-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.neuralnetworks@1.0", + out: ["main.cpp"] +} + +cc_test { + name: "android.hardware.neuralnetworks@1.0-adapter", + defaults: ["hidl-module-defaults"], + shared_libs: [ + "libhidladapter", + "libhidlbase", + "libhidltransport", + "libutils", + "android.hardware.neuralnetworks@1.0", + "android.hardware.neuralnetworks@1.0-adapter-helper", + ], + generated_sources: ["android.hardware.neuralnetworks@1.0-adapter_genc++"], +} diff --git a/oemlock/1.0/Android.bp b/oemlock/1.0/Android.bp index e4cc23626..5dcc89e20 100644 --- a/oemlock/1.0/Android.bp +++ b/oemlock/1.0/Android.bp @@ -66,6 +66,34 @@ cc_library { } genrule { + name: "android.hardware.oemlock-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.oemlock@1.0", + srcs: [ + ":android.hardware.oemlock@1.0_hal", + ], + out: [ + "android/hardware/oemlock/V1_0/OemLockSecureStatus.java", + "android/hardware/oemlock/V1_0/OemLockStatus.java", + "android/hardware/oemlock/V1_0/IOemLock.java", + ], +} + +java_library { + name: "android.hardware.oemlock-V1.0-java", + no_framework_libs: true, + defaults: ["hidl-java-module-defaults"], + srcs: [":android.hardware.oemlock-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.oemlock@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.oemlock@1.0", @@ -89,7 +117,6 @@ genrule { ], } - cc_library { name: "android.hardware.oemlock@1.0-adapter-helper", defaults: ["hidl-module-defaults"], @@ -128,6 +155,7 @@ genrule { cc_test { name: "android.hardware.oemlock@1.0-adapter", + defaults: ["hidl-module-defaults"], shared_libs: [ "libhidladapter", "libhidlbase", diff --git a/oemlock/1.0/Android.mk b/oemlock/1.0/Android.mk deleted file mode 100644 index 91cc8f8cb..000000000 --- a/oemlock/1.0/Android.mk +++ /dev/null @@ -1,83 +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.oemlock-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 (OemLockSecureStatus) -# -GEN := $(intermediates)/android/hardware/oemlock/V1_0/OemLockSecureStatus.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.oemlock@1.0::types.OemLockSecureStatus - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (OemLockStatus) -# -GEN := $(intermediates)/android/hardware/oemlock/V1_0/OemLockStatus.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.oemlock@1.0::types.OemLockStatus - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build IOemLock.hal -# -GEN := $(intermediates)/android/hardware/oemlock/V1_0/IOemLock.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IOemLock.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.oemlock@1.0::IOemLock - -$(GEN): $(LOCAL_PATH)/IOemLock.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) -include $(BUILD_JAVA_LIBRARY) - - - -include $(call all-makefiles-under,$(LOCAL_PATH)) 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)) diff --git a/thermal/1.1/Android.bp b/thermal/1.1/Android.bp index 58e709eea..592699311 100644 --- a/thermal/1.1/Android.bp +++ b/thermal/1.1/Android.bp @@ -71,6 +71,34 @@ cc_library { } genrule { + name: "android.hardware.thermal-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.thermal@1.1", + srcs: [ + ":android.hardware.thermal@1.1_hal", + ], + out: [ + "android/hardware/thermal/V1_1/IThermal.java", + "android/hardware/thermal/V1_1/IThermalCallback.java", + ], +} + +java_library { + name: "android.hardware.thermal-V1.1-java", + no_framework_libs: true, + defaults: ["hidl-java-module-defaults"], + srcs: [":android.hardware.thermal-V1.1-java_gen_java"], + libs: [ + "hwbinder", + "android.hardware.thermal-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.thermal@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.thermal@1.1", @@ -96,7 +124,6 @@ genrule { ], } - cc_library { name: "android.hardware.thermal@1.1-adapter-helper", defaults: ["hidl-module-defaults"], @@ -139,6 +166,7 @@ genrule { cc_test { name: "android.hardware.thermal@1.1-adapter", + defaults: ["hidl-module-defaults"], shared_libs: [ "libhidladapter", "libhidlbase", diff --git a/thermal/1.1/Android.mk b/thermal/1.1/Android.mk deleted file mode 100644 index 059ac8bde..000000000 --- a/thermal/1.1/Android.mk +++ /dev/null @@ -1,65 +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.thermal-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.thermal-V1.0-java \ - android.hidl.base-V1.0-java \ - -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES += core-oj hwbinder - -# -# Build IThermal.hal -# -GEN := $(intermediates)/android/hardware/thermal/V1_1/IThermal.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IThermal.hal -$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IThermalCallback.hal -$(GEN): $(LOCAL_PATH)/IThermalCallback.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.thermal@1.1::IThermal - -$(GEN): $(LOCAL_PATH)/IThermal.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build IThermalCallback.hal -# -GEN := $(intermediates)/android/hardware/thermal/V1_1/IThermalCallback.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IThermalCallback.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.thermal@1.1::IThermalCallback - -$(GEN): $(LOCAL_PATH)/IThermalCallback.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) -include $(BUILD_JAVA_LIBRARY) - - - -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/usb/1.1/Android.bp b/usb/1.1/Android.bp index c6c2034cd..67bc0a668 100644 --- a/usb/1.1/Android.bp +++ b/usb/1.1/Android.bp @@ -75,6 +75,52 @@ cc_library { } genrule { + name: "android.hardware.usb-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.usb@1.1", + srcs: [ + ":android.hardware.usb@1.1_hal", + ], + out: [ + "android/hardware/usb/V1_1/PortMode_1_1.java", + "android/hardware/usb/V1_1/PortStatus_1_1.java", + "android/hardware/usb/V1_1/IUsb.java", + "android/hardware/usb/V1_1/IUsbCallback.java", + ], +} + +java_library { + name: "android.hardware.usb-V1.1-java", + no_framework_libs: true, + defaults: ["hidl-java-module-defaults"], + srcs: [":android.hardware.usb-V1.1-java_gen_java"], + libs: [ + "hwbinder", + "android.hardware.usb-V1.0-java", + "android.hidl.base-V1.0-java", + ] +} + +genrule { + name: "android.hardware.usb-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.usb@1.1", + srcs: [ + ":android.hardware.usb@1.1_hal", + ], + out: [ + "android/hardware/usb/V1_1/Constants.java", + ], +} + +java_library { + name: "android.hardware.usb-V1.1-java-constants", + no_framework_libs: true, + defaults: ["hidl-java-module-defaults"], + srcs: [":android.hardware.usb-V1.1-java-constants_gen_java"], +} + +genrule { name: "android.hardware.usb@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.usb@1.1", @@ -100,7 +146,6 @@ genrule { ], } - cc_library { name: "android.hardware.usb@1.1-adapter-helper", defaults: ["hidl-module-defaults"], @@ -143,6 +188,7 @@ genrule { cc_test { name: "android.hardware.usb@1.1-adapter", + defaults: ["hidl-module-defaults"], shared_libs: [ "libhidladapter", "libhidlbase", diff --git a/usb/1.1/Android.mk b/usb/1.1/Android.mk deleted file mode 100644 index 57147f18e..000000000 --- a/usb/1.1/Android.mk +++ /dev/null @@ -1,138 +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.usb-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.usb-V1.0-java \ - android.hidl.base-V1.0-java \ - -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES += core-oj hwbinder - -# -# Build types.hal (PortMode_1_1) -# -GEN := $(intermediates)/android/hardware/usb/V1_1/PortMode_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.usb@1.1::types.PortMode_1_1 - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (PortStatus_1_1) -# -GEN := $(intermediates)/android/hardware/usb/V1_1/PortStatus_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.usb@1.1::types.PortStatus_1_1 - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build IUsb.hal -# -GEN := $(intermediates)/android/hardware/usb/V1_1/IUsb.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IUsb.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.usb@1.1::IUsb - -$(GEN): $(LOCAL_PATH)/IUsb.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build IUsbCallback.hal -# -GEN := $(intermediates)/android/hardware/usb/V1_1/IUsbCallback.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IUsbCallback.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.usb@1.1::IUsbCallback - -$(GEN): $(LOCAL_PATH)/IUsbCallback.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) -include $(BUILD_JAVA_LIBRARY) - - -################################################################################ - -include $(CLEAR_VARS) -LOCAL_MODULE := android.hardware.usb-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/usb/V1_1/Constants.java -$(GEN): $(HIDL) -$(GEN): $(LOCAL_PATH)/types.hal -$(GEN): $(LOCAL_PATH)/IUsb.hal -$(GEN): $(LOCAL_PATH)/IUsbCallback.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.usb@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)) diff --git a/vibrator/1.1/Android.bp b/vibrator/1.1/Android.bp index 7ce197145..11985fda6 100644 --- a/vibrator/1.1/Android.bp +++ b/vibrator/1.1/Android.bp @@ -68,6 +68,50 @@ cc_library { } 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", @@ -91,7 +135,6 @@ genrule { ], } - cc_library { name: "android.hardware.vibrator@1.1-adapter-helper", defaults: ["hidl-module-defaults"], @@ -134,6 +177,7 @@ genrule { cc_test { name: "android.hardware.vibrator@1.1-adapter", + defaults: ["hidl-module-defaults"], shared_libs: [ "libhidladapter", "libhidlbase", 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)) diff --git a/weaver/1.0/Android.bp b/weaver/1.0/Android.bp index c4077535a..b7bf1fe55 100644 --- a/weaver/1.0/Android.bp +++ b/weaver/1.0/Android.bp @@ -66,6 +66,36 @@ cc_library { } genrule { + name: "android.hardware.weaver-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.weaver@1.0", + srcs: [ + ":android.hardware.weaver@1.0_hal", + ], + out: [ + "android/hardware/weaver/V1_0/WeaverConfig.java", + "android/hardware/weaver/V1_0/WeaverReadResponse.java", + "android/hardware/weaver/V1_0/WeaverReadStatus.java", + "android/hardware/weaver/V1_0/WeaverStatus.java", + "android/hardware/weaver/V1_0/IWeaver.java", + ], +} + +java_library { + name: "android.hardware.weaver-V1.0-java", + no_framework_libs: true, + defaults: ["hidl-java-module-defaults"], + srcs: [":android.hardware.weaver-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.weaver@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.weaver@1.0", @@ -89,7 +119,6 @@ genrule { ], } - cc_library { name: "android.hardware.weaver@1.0-adapter-helper", defaults: ["hidl-module-defaults"], @@ -128,6 +157,7 @@ genrule { cc_test { name: "android.hardware.weaver@1.0-adapter", + defaults: ["hidl-module-defaults"], shared_libs: [ "libhidladapter", "libhidlbase", diff --git a/weaver/1.0/Android.mk b/weaver/1.0/Android.mk deleted file mode 100644 index ab33a158d..000000000 --- a/weaver/1.0/Android.mk +++ /dev/null @@ -1,121 +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.weaver-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 (WeaverConfig) -# -GEN := $(intermediates)/android/hardware/weaver/V1_0/WeaverConfig.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.weaver@1.0::types.WeaverConfig - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (WeaverReadResponse) -# -GEN := $(intermediates)/android/hardware/weaver/V1_0/WeaverReadResponse.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.weaver@1.0::types.WeaverReadResponse - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (WeaverReadStatus) -# -GEN := $(intermediates)/android/hardware/weaver/V1_0/WeaverReadStatus.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.weaver@1.0::types.WeaverReadStatus - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build types.hal (WeaverStatus) -# -GEN := $(intermediates)/android/hardware/weaver/V1_0/WeaverStatus.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.weaver@1.0::types.WeaverStatus - -$(GEN): $(LOCAL_PATH)/types.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build IWeaver.hal -# -GEN := $(intermediates)/android/hardware/weaver/V1_0/IWeaver.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWeaver.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.weaver@1.0::IWeaver - -$(GEN): $(LOCAL_PATH)/IWeaver.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) -include $(BUILD_JAVA_LIBRARY) - - - -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/wifi/1.1/Android.bp b/wifi/1.1/Android.bp index 0b6ecb81f..0878abc8a 100644 --- a/wifi/1.1/Android.bp +++ b/wifi/1.1/Android.bp @@ -71,6 +71,34 @@ cc_library { } genrule { + name: "android.hardware.wifi-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.wifi@1.1", + srcs: [ + ":android.hardware.wifi@1.1_hal", + ], + out: [ + "android/hardware/wifi/V1_1/IWifi.java", + "android/hardware/wifi/V1_1/IWifiChip.java", + ], +} + +java_library { + name: "android.hardware.wifi-V1.1-java", + no_framework_libs: true, + defaults: ["hidl-java-module-defaults"], + srcs: [":android.hardware.wifi-V1.1-java_gen_java"], + libs: [ + "hwbinder", + "android.hardware.wifi-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.wifi@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.wifi@1.1", @@ -96,7 +124,6 @@ genrule { ], } - cc_library { name: "android.hardware.wifi@1.1-adapter-helper", defaults: ["hidl-module-defaults"], @@ -139,6 +166,7 @@ genrule { cc_test { name: "android.hardware.wifi@1.1-adapter", + defaults: ["hidl-module-defaults"], shared_libs: [ "libhidladapter", "libhidlbase", diff --git a/wifi/1.1/Android.mk b/wifi/1.1/Android.mk deleted file mode 100644 index 5f4bc6a47..000000000 --- a/wifi/1.1/Android.mk +++ /dev/null @@ -1,63 +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.wifi-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.wifi-V1.0-java \ - android.hidl.base-V1.0-java \ - -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES += core-oj hwbinder - -# -# Build IWifi.hal -# -GEN := $(intermediates)/android/hardware/wifi/V1_1/IWifi.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifi.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.wifi@1.1::IWifi - -$(GEN): $(LOCAL_PATH)/IWifi.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build IWifiChip.hal -# -GEN := $(intermediates)/android/hardware/wifi/V1_1/IWifiChip.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiChip.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.wifi@1.1::IWifiChip - -$(GEN): $(LOCAL_PATH)/IWifiChip.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) -include $(BUILD_JAVA_LIBRARY) - - - -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/wifi/1.2/Android.bp b/wifi/1.2/Android.bp index 4cf5b3567..7547848a4 100644 --- a/wifi/1.2/Android.bp +++ b/wifi/1.2/Android.bp @@ -73,6 +73,35 @@ cc_library { } genrule { + name: "android.hardware.wifi-V1.2-java_gen_java", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.wifi@1.2", + srcs: [ + ":android.hardware.wifi@1.2_hal", + ], + out: [ + "android/hardware/wifi/V1_2/IWifi.java", + "android/hardware/wifi/V1_2/IWifiChip.java", + ], +} + +java_library { + name: "android.hardware.wifi-V1.2-java", + no_framework_libs: true, + defaults: ["hidl-java-module-defaults"], + srcs: [":android.hardware.wifi-V1.2-java_gen_java"], + libs: [ + "hwbinder", + "android.hardware.wifi-V1.0-java", + "android.hardware.wifi-V1.1-java", + "android.hidl.base-V1.0-java", + ] +} + +// This package does not export any types. Not creating java constants export. + + +genrule { name: "android.hardware.wifi@1.2-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.wifi@1.2", @@ -98,7 +127,6 @@ genrule { ], } - cc_library { name: "android.hardware.wifi@1.2-adapter-helper", defaults: ["hidl-module-defaults"], @@ -145,6 +173,7 @@ genrule { cc_test { name: "android.hardware.wifi@1.2-adapter", + defaults: ["hidl-module-defaults"], shared_libs: [ "libhidladapter", "libhidlbase", diff --git a/wifi/1.2/Android.mk b/wifi/1.2/Android.mk deleted file mode 100644 index d7380768c..000000000 --- a/wifi/1.2/Android.mk +++ /dev/null @@ -1,64 +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.wifi-V1.2-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.wifi-V1.0-java \ - android.hardware.wifi-V1.1-java \ - android.hidl.base-V1.0-java \ - -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES += core-oj hwbinder - -# -# Build IWifi.hal -# -GEN := $(intermediates)/android/hardware/wifi/V1_2/IWifi.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifi.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.wifi@1.2::IWifi - -$(GEN): $(LOCAL_PATH)/IWifi.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# -# Build IWifiChip.hal -# -GEN := $(intermediates)/android/hardware/wifi/V1_2/IWifiChip.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiChip.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.wifi@1.2::IWifiChip - -$(GEN): $(LOCAL_PATH)/IWifiChip.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) -include $(BUILD_JAVA_LIBRARY) - - - -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/wifi/offload/1.0/Android.bp b/wifi/offload/1.0/Android.bp index 017fc397e..12b2ff6cb 100644 --- a/wifi/offload/1.0/Android.bp +++ b/wifi/offload/1.0/Android.bp @@ -72,6 +72,11 @@ cc_library { ], } +// This package is not java compatible. Not creating java target. + +// This package does not export any types. Not creating java constants export. + + genrule { name: "android.hardware.wifi.offload@1.0-adapter-helper_genc++", tools: ["hidl-gen"], @@ -98,7 +103,6 @@ genrule { ], } - cc_library { name: "android.hardware.wifi.offload@1.0-adapter-helper", defaults: ["hidl-module-defaults"], @@ -137,6 +141,7 @@ genrule { cc_test { name: "android.hardware.wifi.offload@1.0-adapter", + defaults: ["hidl-module-defaults"], shared_libs: [ "libhidladapter", "libhidlbase", diff --git a/wifi/supplicant/1.1/Android.bp b/wifi/supplicant/1.1/Android.bp index c232a6c29..9dc65ef22 100644 --- a/wifi/supplicant/1.1/Android.bp +++ b/wifi/supplicant/1.1/Android.bp @@ -64,6 +64,33 @@ cc_library { } genrule { + name: "android.hardware.wifi.supplicant-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.wifi.supplicant@1.1", + srcs: [ + ":android.hardware.wifi.supplicant@1.1_hal", + ], + out: [ + "android/hardware/wifi/supplicant/V1_1/ISupplicant.java", + ], +} + +java_library { + name: "android.hardware.wifi.supplicant-V1.1-java", + no_framework_libs: true, + defaults: ["hidl-java-module-defaults"], + srcs: [":android.hardware.wifi.supplicant-V1.1-java_gen_java"], + libs: [ + "hwbinder", + "android.hardware.wifi.supplicant-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.wifi.supplicant@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.wifi.supplicant@1.1", @@ -87,7 +114,6 @@ genrule { ], } - cc_library { name: "android.hardware.wifi.supplicant@1.1-adapter-helper", defaults: ["hidl-module-defaults"], diff --git a/wifi/supplicant/1.1/Android.mk b/wifi/supplicant/1.1/Android.mk deleted file mode 100644 index 198122edb..000000000 --- a/wifi/supplicant/1.1/Android.mk +++ /dev/null @@ -1,44 +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.wifi.supplicant-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.wifi.supplicant-V1.0-java \ - android.hidl.base-V1.0-java \ - -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES += core-oj hwbinder - -# -# Build ISupplicant.hal -# -GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_1/ISupplicant.java -$(GEN): $(HIDL) -$(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicant.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.wifi.supplicant@1.1::ISupplicant - -$(GEN): $(LOCAL_PATH)/ISupplicant.hal - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) -include $(BUILD_JAVA_LIBRARY) - - - -include $(call all-makefiles-under,$(LOCAL_PATH)) |