Merge "Update makefiles for Java package path."

This commit is contained in:
Treehugger Robot 2016-12-14 03:43:57 +00:00 committed by Gerrit Code Review
commit 698b6a9614
11 changed files with 633 additions and 633 deletions

View file

@ -19,7 +19,7 @@ LOCAL_JAVA_LIBRARIES := \
#
# Build types.hal (Status)
#
GEN := $(intermediates)/android/hardware/bluetooth/1.0/Status.java
GEN := $(intermediates)/android/hardware/bluetooth/V1_0/Status.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@ -38,7 +38,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build IBluetoothHci.hal
#
GEN := $(intermediates)/android/hardware/bluetooth/1.0/IBluetoothHci.java
GEN := $(intermediates)/android/hardware/bluetooth/V1_0/IBluetoothHci.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBluetoothHci.hal
@ -61,7 +61,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build IBluetoothHciCallbacks.hal
#
GEN := $(intermediates)/android/hardware/bluetooth/1.0/IBluetoothHciCallbacks.java
GEN := $(intermediates)/android/hardware/bluetooth/V1_0/IBluetoothHciCallbacks.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBluetoothHciCallbacks.hal
@ -98,7 +98,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
#
# Build types.hal (Status)
#
GEN := $(intermediates)/android/hardware/bluetooth/1.0/Status.java
GEN := $(intermediates)/android/hardware/bluetooth/V1_0/Status.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@ -117,7 +117,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build IBluetoothHci.hal
#
GEN := $(intermediates)/android/hardware/bluetooth/1.0/IBluetoothHci.java
GEN := $(intermediates)/android/hardware/bluetooth/V1_0/IBluetoothHci.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBluetoothHci.hal
@ -140,7 +140,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build IBluetoothHciCallbacks.hal
#
GEN := $(intermediates)/android/hardware/bluetooth/1.0/IBluetoothHciCallbacks.java
GEN := $(intermediates)/android/hardware/bluetooth/V1_0/IBluetoothHciCallbacks.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBluetoothHciCallbacks.hal

View file

@ -19,7 +19,7 @@ LOCAL_JAVA_LIBRARIES := \
#
# Build types.hal (BoolResult)
#
GEN := $(intermediates)/android/hardware/boot/1.0/BoolResult.java
GEN := $(intermediates)/android/hardware/boot/V1_0/BoolResult.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@ -38,7 +38,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build types.hal (CommandResult)
#
GEN := $(intermediates)/android/hardware/boot/1.0/CommandResult.java
GEN := $(intermediates)/android/hardware/boot/V1_0/CommandResult.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@ -57,7 +57,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build IBootControl.hal
#
GEN := $(intermediates)/android/hardware/boot/1.0/IBootControl.java
GEN := $(intermediates)/android/hardware/boot/V1_0/IBootControl.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBootControl.hal
@ -94,7 +94,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
#
# Build types.hal (BoolResult)
#
GEN := $(intermediates)/android/hardware/boot/1.0/BoolResult.java
GEN := $(intermediates)/android/hardware/boot/V1_0/BoolResult.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@ -113,7 +113,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build types.hal (CommandResult)
#
GEN := $(intermediates)/android/hardware/boot/1.0/CommandResult.java
GEN := $(intermediates)/android/hardware/boot/V1_0/CommandResult.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@ -132,7 +132,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build IBootControl.hal
#
GEN := $(intermediates)/android/hardware/boot/1.0/IBootControl.java
GEN := $(intermediates)/android/hardware/boot/V1_0/IBootControl.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBootControl.hal

View file

@ -19,7 +19,7 @@ LOCAL_JAVA_LIBRARIES := \
#
# Build types.hal (ConsumerIrFreqRange)
#
GEN := $(intermediates)/android/hardware/ir/1.0/ConsumerIrFreqRange.java
GEN := $(intermediates)/android/hardware/ir/V1_0/ConsumerIrFreqRange.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@ -38,7 +38,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build IConsumerIr.hal
#
GEN := $(intermediates)/android/hardware/ir/1.0/IConsumerIr.java
GEN := $(intermediates)/android/hardware/ir/V1_0/IConsumerIr.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IConsumerIr.hal
@ -75,7 +75,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
#
# Build types.hal (ConsumerIrFreqRange)
#
GEN := $(intermediates)/android/hardware/ir/1.0/ConsumerIrFreqRange.java
GEN := $(intermediates)/android/hardware/ir/V1_0/ConsumerIrFreqRange.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@ -94,7 +94,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build IConsumerIr.hal
#
GEN := $(intermediates)/android/hardware/ir/1.0/IConsumerIr.java
GEN := $(intermediates)/android/hardware/ir/V1_0/IConsumerIr.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IConsumerIr.hal

View file

@ -19,7 +19,7 @@ LOCAL_JAVA_LIBRARIES := \
#
# Build types.hal (NfcEvent)
#
GEN := $(intermediates)/android/hardware/nfc/1.0/NfcEvent.java
GEN := $(intermediates)/android/hardware/nfc/V1_0/NfcEvent.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@ -38,7 +38,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build types.hal (NfcStatus)
#
GEN := $(intermediates)/android/hardware/nfc/1.0/NfcStatus.java
GEN := $(intermediates)/android/hardware/nfc/V1_0/NfcStatus.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@ -57,7 +57,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build INfc.hal
#
GEN := $(intermediates)/android/hardware/nfc/1.0/INfc.java
GEN := $(intermediates)/android/hardware/nfc/V1_0/INfc.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/INfc.hal
@ -80,7 +80,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build INfcClientCallback.hal
#
GEN := $(intermediates)/android/hardware/nfc/1.0/INfcClientCallback.java
GEN := $(intermediates)/android/hardware/nfc/V1_0/INfcClientCallback.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/INfcClientCallback.hal
@ -117,7 +117,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
#
# Build types.hal (NfcEvent)
#
GEN := $(intermediates)/android/hardware/nfc/1.0/NfcEvent.java
GEN := $(intermediates)/android/hardware/nfc/V1_0/NfcEvent.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@ -136,7 +136,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build types.hal (NfcStatus)
#
GEN := $(intermediates)/android/hardware/nfc/1.0/NfcStatus.java
GEN := $(intermediates)/android/hardware/nfc/V1_0/NfcStatus.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@ -155,7 +155,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build INfc.hal
#
GEN := $(intermediates)/android/hardware/nfc/1.0/INfc.java
GEN := $(intermediates)/android/hardware/nfc/V1_0/INfc.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/INfc.hal
@ -178,7 +178,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build INfcClientCallback.hal
#
GEN := $(intermediates)/android/hardware/nfc/1.0/INfcClientCallback.java
GEN := $(intermediates)/android/hardware/nfc/V1_0/INfcClientCallback.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/INfcClientCallback.hal
@ -208,7 +208,7 @@ intermediates := $(local-generated-sources-dir)
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
#
GEN := $(intermediates)/android/hardware/nfc/1.0/Constants.java
GEN := $(intermediates)/android/hardware/nfc/V1_0/Constants.java
$(GEN): $(HIDL)
$(GEN): $(LOCAL_PATH)/types.hal
$(GEN): $(LOCAL_PATH)/INfc.hal

File diff suppressed because it is too large Load diff

View file

@ -19,7 +19,7 @@ LOCAL_JAVA_LIBRARIES := \
#
# Build IBase.hal
#
GEN := $(intermediates)/android/hardware/tests/baz/1.0/IBase.java
GEN := $(intermediates)/android/hardware/tests/baz/V1_0/IBase.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBase.hal
@ -38,7 +38,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build IBaz.hal
#
GEN := $(intermediates)/android/hardware/tests/baz/1.0/IBaz.java
GEN := $(intermediates)/android/hardware/tests/baz/V1_0/IBaz.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBaz.hal
@ -61,7 +61,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build IBazCallback.hal
#
GEN := $(intermediates)/android/hardware/tests/baz/1.0/IBazCallback.java
GEN := $(intermediates)/android/hardware/tests/baz/V1_0/IBazCallback.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBazCallback.hal
@ -96,7 +96,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
#
# Build IBase.hal
#
GEN := $(intermediates)/android/hardware/tests/baz/1.0/IBase.java
GEN := $(intermediates)/android/hardware/tests/baz/V1_0/IBase.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBase.hal
@ -115,7 +115,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build IBaz.hal
#
GEN := $(intermediates)/android/hardware/tests/baz/1.0/IBaz.java
GEN := $(intermediates)/android/hardware/tests/baz/V1_0/IBaz.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBaz.hal
@ -138,7 +138,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build IBazCallback.hal
#
GEN := $(intermediates)/android/hardware/tests/baz/1.0/IBazCallback.java
GEN := $(intermediates)/android/hardware/tests/baz/V1_0/IBazCallback.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBazCallback.hal

View file

@ -19,7 +19,7 @@ LOCAL_JAVA_LIBRARIES := \
#
# Build IExpression.hal
#
GEN := $(intermediates)/android/hardware/tests/expression/1.0/IExpression.java
GEN := $(intermediates)/android/hardware/tests/expression/V1_0/IExpression.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IExpression.hal
@ -38,7 +38,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build IExpressionExt.hal
#
GEN := $(intermediates)/android/hardware/tests/expression/1.0/IExpressionExt.java
GEN := $(intermediates)/android/hardware/tests/expression/V1_0/IExpressionExt.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IExpressionExt.hal
@ -75,7 +75,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
#
# Build IExpression.hal
#
GEN := $(intermediates)/android/hardware/tests/expression/1.0/IExpression.java
GEN := $(intermediates)/android/hardware/tests/expression/V1_0/IExpression.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IExpression.hal
@ -94,7 +94,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build IExpressionExt.hal
#
GEN := $(intermediates)/android/hardware/tests/expression/1.0/IExpressionExt.java
GEN := $(intermediates)/android/hardware/tests/expression/V1_0/IExpressionExt.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IExpressionExt.hal

View file

@ -19,7 +19,7 @@ LOCAL_JAVA_LIBRARIES := \
#
# Build IChild.hal
#
GEN := $(intermediates)/android/hardware/tests/inheritance/1.0/IChild.java
GEN := $(intermediates)/android/hardware/tests/inheritance/V1_0/IChild.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IChild.hal
@ -40,7 +40,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build IFetcher.hal
#
GEN := $(intermediates)/android/hardware/tests/inheritance/1.0/IFetcher.java
GEN := $(intermediates)/android/hardware/tests/inheritance/V1_0/IFetcher.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IFetcher.hal
@ -65,7 +65,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build IGrandparent.hal
#
GEN := $(intermediates)/android/hardware/tests/inheritance/1.0/IGrandparent.java
GEN := $(intermediates)/android/hardware/tests/inheritance/V1_0/IGrandparent.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IGrandparent.hal
@ -84,7 +84,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build IParent.hal
#
GEN := $(intermediates)/android/hardware/tests/inheritance/1.0/IParent.java
GEN := $(intermediates)/android/hardware/tests/inheritance/V1_0/IParent.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IParent.hal
@ -121,7 +121,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
#
# Build IChild.hal
#
GEN := $(intermediates)/android/hardware/tests/inheritance/1.0/IChild.java
GEN := $(intermediates)/android/hardware/tests/inheritance/V1_0/IChild.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IChild.hal
@ -142,7 +142,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build IFetcher.hal
#
GEN := $(intermediates)/android/hardware/tests/inheritance/1.0/IFetcher.java
GEN := $(intermediates)/android/hardware/tests/inheritance/V1_0/IFetcher.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IFetcher.hal
@ -167,7 +167,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build IGrandparent.hal
#
GEN := $(intermediates)/android/hardware/tests/inheritance/1.0/IGrandparent.java
GEN := $(intermediates)/android/hardware/tests/inheritance/V1_0/IGrandparent.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IGrandparent.hal
@ -186,7 +186,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build IParent.hal
#
GEN := $(intermediates)/android/hardware/tests/inheritance/1.0/IParent.java
GEN := $(intermediates)/android/hardware/tests/inheritance/V1_0/IParent.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IParent.hal

View file

@ -19,7 +19,7 @@ LOCAL_JAVA_LIBRARIES := \
#
# Build IBenchmark.hal
#
GEN := $(intermediates)/android/hardware/tests/libhwbinder/1.0/IBenchmark.java
GEN := $(intermediates)/android/hardware/tests/libhwbinder/V1_0/IBenchmark.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBenchmark.hal
@ -54,7 +54,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
#
# Build IBenchmark.hal
#
GEN := $(intermediates)/android/hardware/tests/libhwbinder/1.0/IBenchmark.java
GEN := $(intermediates)/android/hardware/tests/libhwbinder/V1_0/IBenchmark.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IBenchmark.hal

File diff suppressed because it is too large Load diff

View file

@ -19,7 +19,7 @@ LOCAL_JAVA_LIBRARIES := \
#
# Build types.hal (IfaceType)
#
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/IfaceType.java
GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/IfaceType.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@ -38,7 +38,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build types.hal (SupplicantStatus)
#
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/SupplicantStatus.java
GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/SupplicantStatus.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@ -57,7 +57,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build types.hal (SupplicantStatusCode)
#
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/SupplicantStatusCode.java
GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/SupplicantStatusCode.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@ -76,7 +76,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build ISupplicant.hal
#
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicant.java
GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicant.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicant.hal
@ -101,7 +101,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build ISupplicantCallback.hal
#
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantCallback.java
GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantCallback.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantCallback.hal
@ -120,7 +120,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build ISupplicantIface.hal
#
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantIface.java
GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantIface.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantIface.hal
@ -143,7 +143,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build ISupplicantNetwork.hal
#
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantNetwork.java
GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantNetwork.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantNetwork.hal
@ -164,7 +164,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build ISupplicantP2pIface.hal
#
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantP2pIface.java
GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantP2pIface.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantP2pIface.hal
@ -189,7 +189,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build ISupplicantP2pIfaceCallback.hal
#
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantP2pIfaceCallback.java
GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantP2pIfaceCallback.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantP2pIfaceCallback.hal
@ -210,7 +210,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build ISupplicantP2pNetwork.hal
#
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantP2pNetwork.java
GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantP2pNetwork.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantP2pNetwork.hal
@ -235,7 +235,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build ISupplicantP2pNetworkCallback.hal
#
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantP2pNetworkCallback.java
GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantP2pNetworkCallback.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantP2pNetworkCallback.hal
@ -254,7 +254,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build ISupplicantStaIface.hal
#
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantStaIface.java
GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantStaIface.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantStaIface.hal
@ -279,7 +279,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build ISupplicantStaIfaceCallback.hal
#
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantStaIfaceCallback.java
GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantStaIfaceCallback.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantStaIfaceCallback.hal
@ -300,7 +300,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build ISupplicantStaNetwork.hal
#
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantStaNetwork.java
GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantStaNetwork.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantStaNetwork.hal
@ -325,7 +325,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build ISupplicantStaNetworkCallback.hal
#
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantStaNetworkCallback.java
GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantStaNetworkCallback.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantStaNetworkCallback.hal
@ -360,7 +360,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
#
# Build types.hal (IfaceType)
#
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/IfaceType.java
GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/IfaceType.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@ -379,7 +379,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build types.hal (SupplicantStatus)
#
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/SupplicantStatus.java
GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/SupplicantStatus.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@ -398,7 +398,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build types.hal (SupplicantStatusCode)
#
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/SupplicantStatusCode.java
GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/SupplicantStatusCode.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
@ -417,7 +417,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build ISupplicant.hal
#
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicant.java
GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicant.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicant.hal
@ -442,7 +442,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build ISupplicantCallback.hal
#
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantCallback.java
GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantCallback.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantCallback.hal
@ -461,7 +461,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build ISupplicantIface.hal
#
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantIface.java
GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantIface.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantIface.hal
@ -484,7 +484,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build ISupplicantNetwork.hal
#
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantNetwork.java
GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantNetwork.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantNetwork.hal
@ -505,7 +505,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build ISupplicantP2pIface.hal
#
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantP2pIface.java
GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantP2pIface.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantP2pIface.hal
@ -530,7 +530,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build ISupplicantP2pIfaceCallback.hal
#
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantP2pIfaceCallback.java
GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantP2pIfaceCallback.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantP2pIfaceCallback.hal
@ -551,7 +551,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build ISupplicantP2pNetwork.hal
#
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantP2pNetwork.java
GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantP2pNetwork.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantP2pNetwork.hal
@ -576,7 +576,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build ISupplicantP2pNetworkCallback.hal
#
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantP2pNetworkCallback.java
GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantP2pNetworkCallback.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantP2pNetworkCallback.hal
@ -595,7 +595,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build ISupplicantStaIface.hal
#
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantStaIface.java
GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantStaIface.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantStaIface.hal
@ -620,7 +620,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build ISupplicantStaIfaceCallback.hal
#
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantStaIfaceCallback.java
GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantStaIfaceCallback.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantStaIfaceCallback.hal
@ -641,7 +641,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build ISupplicantStaNetwork.hal
#
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantStaNetwork.java
GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantStaNetwork.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantStaNetwork.hal
@ -666,7 +666,7 @@ LOCAL_GENERATED_SOURCES += $(GEN)
#
# Build ISupplicantStaNetworkCallback.hal
#
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantStaNetworkCallback.java
GEN := $(intermediates)/android/hardware/wifi/supplicant/V1_0/ISupplicantStaNetworkCallback.java
$(GEN): $(HIDL)
$(GEN): PRIVATE_HIDL := $(HIDL)
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantStaNetworkCallback.hal