diff --git a/bluetooth/1.0/Android.mk b/bluetooth/1.0/Android.mk index 887cbd691b..7924ceead1 100644 --- a/bluetooth/1.0/Android.mk +++ b/bluetooth/1.0/Android.mk @@ -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 diff --git a/boot/1.0/Android.mk b/boot/1.0/Android.mk index cd7b9e548a..6fa5e4bb47 100644 --- a/boot/1.0/Android.mk +++ b/boot/1.0/Android.mk @@ -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 diff --git a/ir/1.0/Android.mk b/ir/1.0/Android.mk index 5d29b30f38..660b32b174 100644 --- a/ir/1.0/Android.mk +++ b/ir/1.0/Android.mk @@ -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 diff --git a/nfc/1.0/Android.mk b/nfc/1.0/Android.mk index f534944e43..823bde5277 100644 --- a/nfc/1.0/Android.mk +++ b/nfc/1.0/Android.mk @@ -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 diff --git a/radio/1.0/Android.mk b/radio/1.0/Android.mk index faed33a1e3..c645657a51 100644 --- a/radio/1.0/Android.mk +++ b/radio/1.0/Android.mk @@ -19,7 +19,7 @@ LOCAL_JAVA_LIBRARIES := \ # # Build types.hal (ActivityStatsInfo) # -GEN := $(intermediates)/android/hardware/radio/1.0/ActivityStatsInfo.java +GEN := $(intermediates)/android/hardware/radio/V1_0/ActivityStatsInfo.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 (ApnAuthType) # -GEN := $(intermediates)/android/hardware/radio/1.0/ApnAuthType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/ApnAuthType.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 (AppState) # -GEN := $(intermediates)/android/hardware/radio/1.0/AppState.java +GEN := $(intermediates)/android/hardware/radio/V1_0/AppState.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -76,7 +76,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (AppStatus) # -GEN := $(intermediates)/android/hardware/radio/1.0/AppStatus.java +GEN := $(intermediates)/android/hardware/radio/V1_0/AppStatus.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -95,7 +95,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (AppType) # -GEN := $(intermediates)/android/hardware/radio/1.0/AppType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/AppType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -114,7 +114,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (Call) # -GEN := $(intermediates)/android/hardware/radio/1.0/Call.java +GEN := $(intermediates)/android/hardware/radio/V1_0/Call.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -133,7 +133,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CallForwardInfo) # -GEN := $(intermediates)/android/hardware/radio/1.0/CallForwardInfo.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CallForwardInfo.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -152,7 +152,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CallForwardInfoStatus) # -GEN := $(intermediates)/android/hardware/radio/1.0/CallForwardInfoStatus.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CallForwardInfoStatus.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -171,7 +171,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CallPresentation) # -GEN := $(intermediates)/android/hardware/radio/1.0/CallPresentation.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CallPresentation.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -190,7 +190,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CallState) # -GEN := $(intermediates)/android/hardware/radio/1.0/CallState.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CallState.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -209,7 +209,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CardState) # -GEN := $(intermediates)/android/hardware/radio/1.0/CardState.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CardState.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -228,7 +228,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CardStatus) # -GEN := $(intermediates)/android/hardware/radio/1.0/CardStatus.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CardStatus.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -247,7 +247,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (Carrier) # -GEN := $(intermediates)/android/hardware/radio/1.0/Carrier.java +GEN := $(intermediates)/android/hardware/radio/V1_0/Carrier.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -266,7 +266,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CarrierMatchType) # -GEN := $(intermediates)/android/hardware/radio/1.0/CarrierMatchType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CarrierMatchType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -285,7 +285,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CarrierRestrictions) # -GEN := $(intermediates)/android/hardware/radio/1.0/CarrierRestrictions.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CarrierRestrictions.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -304,7 +304,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaBroadcastSmsConfigInfo) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaBroadcastSmsConfigInfo.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaBroadcastSmsConfigInfo.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -323,7 +323,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaCallWaiting) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaCallWaiting.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaCallWaiting.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -342,7 +342,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaCallWaitingNumberPlan) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaCallWaitingNumberPlan.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaCallWaitingNumberPlan.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -361,7 +361,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaCallWaitingNumberPresentation) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaCallWaitingNumberPresentation.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaCallWaitingNumberPresentation.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -380,7 +380,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaCallWaitingNumberType) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaCallWaitingNumberType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaCallWaitingNumberType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -399,7 +399,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaDisplayInfoRecord) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaDisplayInfoRecord.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaDisplayInfoRecord.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -418,7 +418,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaInfoRecName) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaInfoRecName.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaInfoRecName.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -437,7 +437,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaInformationRecord) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaInformationRecord.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaInformationRecord.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -456,7 +456,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaInformationRecords) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaInformationRecords.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaInformationRecords.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -475,7 +475,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaLineControlInfoRecord) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaLineControlInfoRecord.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaLineControlInfoRecord.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -494,7 +494,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaNumberInfoRecord) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaNumberInfoRecord.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaNumberInfoRecord.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -513,7 +513,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaOtaProvisionStatus) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaOtaProvisionStatus.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaOtaProvisionStatus.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -532,7 +532,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaRedirectingNumberInfoRecord) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaRedirectingNumberInfoRecord.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaRedirectingNumberInfoRecord.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -551,7 +551,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaRedirectingReason) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaRedirectingReason.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaRedirectingReason.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -570,7 +570,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaRoamingType) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaRoamingType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaRoamingType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -589,7 +589,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaSignalInfoRecord) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSignalInfoRecord.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSignalInfoRecord.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -608,7 +608,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaSignalStrength) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSignalStrength.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSignalStrength.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -627,7 +627,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaSmsAck) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsAck.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsAck.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -646,7 +646,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaSmsAddress) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsAddress.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsAddress.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -665,7 +665,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaSmsDigitMode) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsDigitMode.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsDigitMode.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -684,7 +684,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaSmsErrorClass) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsErrorClass.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsErrorClass.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -703,7 +703,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaSmsMessage) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsMessage.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsMessage.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -722,7 +722,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaSmsNumberMode) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsNumberMode.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsNumberMode.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -741,7 +741,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaSmsNumberPlan) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsNumberPlan.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsNumberPlan.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -760,7 +760,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaSmsNumberType) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsNumberType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsNumberType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -779,7 +779,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaSmsSubaddress) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsSubaddress.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsSubaddress.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -798,7 +798,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaSmsSubaddressType) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsSubaddressType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsSubaddressType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -817,7 +817,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaSmsWriteArgs) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsWriteArgs.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsWriteArgs.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -836,7 +836,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaSmsWriteArgsStatus) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsWriteArgsStatus.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsWriteArgsStatus.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -855,7 +855,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaSubscriptionSource) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSubscriptionSource.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSubscriptionSource.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -874,7 +874,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaT53AudioControlInfoRecord) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaT53AudioControlInfoRecord.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaT53AudioControlInfoRecord.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -893,7 +893,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaT53ClirInfoRecord) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaT53ClirInfoRecord.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaT53ClirInfoRecord.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -912,7 +912,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CellIdentityCdma) # -GEN := $(intermediates)/android/hardware/radio/1.0/CellIdentityCdma.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CellIdentityCdma.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -931,7 +931,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CellIdentityGsm) # -GEN := $(intermediates)/android/hardware/radio/1.0/CellIdentityGsm.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CellIdentityGsm.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -950,7 +950,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CellIdentityLte) # -GEN := $(intermediates)/android/hardware/radio/1.0/CellIdentityLte.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CellIdentityLte.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -969,7 +969,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CellIdentityTdscdma) # -GEN := $(intermediates)/android/hardware/radio/1.0/CellIdentityTdscdma.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CellIdentityTdscdma.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -988,7 +988,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CellIdentityWcdma) # -GEN := $(intermediates)/android/hardware/radio/1.0/CellIdentityWcdma.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CellIdentityWcdma.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1007,7 +1007,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CellInfo) # -GEN := $(intermediates)/android/hardware/radio/1.0/CellInfo.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CellInfo.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1026,7 +1026,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CellInfoCdma) # -GEN := $(intermediates)/android/hardware/radio/1.0/CellInfoCdma.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CellInfoCdma.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1045,7 +1045,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CellInfoGsm) # -GEN := $(intermediates)/android/hardware/radio/1.0/CellInfoGsm.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CellInfoGsm.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1064,7 +1064,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CellInfoLte) # -GEN := $(intermediates)/android/hardware/radio/1.0/CellInfoLte.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CellInfoLte.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1083,7 +1083,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CellInfoTdscdma) # -GEN := $(intermediates)/android/hardware/radio/1.0/CellInfoTdscdma.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CellInfoTdscdma.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1102,7 +1102,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CellInfoType) # -GEN := $(intermediates)/android/hardware/radio/1.0/CellInfoType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CellInfoType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1121,7 +1121,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CellInfoWcdma) # -GEN := $(intermediates)/android/hardware/radio/1.0/CellInfoWcdma.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CellInfoWcdma.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1140,7 +1140,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CfData) # -GEN := $(intermediates)/android/hardware/radio/1.0/CfData.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CfData.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1159,7 +1159,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (ClipStatus) # -GEN := $(intermediates)/android/hardware/radio/1.0/ClipStatus.java +GEN := $(intermediates)/android/hardware/radio/V1_0/ClipStatus.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1178,7 +1178,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (Clir) # -GEN := $(intermediates)/android/hardware/radio/1.0/Clir.java +GEN := $(intermediates)/android/hardware/radio/V1_0/Clir.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1197,7 +1197,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (DataCallFailCause) # -GEN := $(intermediates)/android/hardware/radio/1.0/DataCallFailCause.java +GEN := $(intermediates)/android/hardware/radio/V1_0/DataCallFailCause.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1216,7 +1216,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (DataProfile) # -GEN := $(intermediates)/android/hardware/radio/1.0/DataProfile.java +GEN := $(intermediates)/android/hardware/radio/V1_0/DataProfile.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1235,7 +1235,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (DataProfileInfo) # -GEN := $(intermediates)/android/hardware/radio/1.0/DataProfileInfo.java +GEN := $(intermediates)/android/hardware/radio/V1_0/DataProfileInfo.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1254,7 +1254,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (DataProfileInfoType) # -GEN := $(intermediates)/android/hardware/radio/1.0/DataProfileInfoType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/DataProfileInfoType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1273,7 +1273,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (DataRegStateResult) # -GEN := $(intermediates)/android/hardware/radio/1.0/DataRegStateResult.java +GEN := $(intermediates)/android/hardware/radio/V1_0/DataRegStateResult.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1292,7 +1292,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (Dial) # -GEN := $(intermediates)/android/hardware/radio/1.0/Dial.java +GEN := $(intermediates)/android/hardware/radio/V1_0/Dial.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1311,7 +1311,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (EvdoSignalStrength) # -GEN := $(intermediates)/android/hardware/radio/1.0/EvdoSignalStrength.java +GEN := $(intermediates)/android/hardware/radio/V1_0/EvdoSignalStrength.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1330,7 +1330,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (GsmBroadcastSmsConfigInfo) # -GEN := $(intermediates)/android/hardware/radio/1.0/GsmBroadcastSmsConfigInfo.java +GEN := $(intermediates)/android/hardware/radio/V1_0/GsmBroadcastSmsConfigInfo.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1349,7 +1349,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (GsmSignalStrength) # -GEN := $(intermediates)/android/hardware/radio/1.0/GsmSignalStrength.java +GEN := $(intermediates)/android/hardware/radio/V1_0/GsmSignalStrength.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1368,7 +1368,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (GsmSmsMessage) # -GEN := $(intermediates)/android/hardware/radio/1.0/GsmSmsMessage.java +GEN := $(intermediates)/android/hardware/radio/V1_0/GsmSmsMessage.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1387,7 +1387,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (HardwareConfig) # -GEN := $(intermediates)/android/hardware/radio/1.0/HardwareConfig.java +GEN := $(intermediates)/android/hardware/radio/V1_0/HardwareConfig.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1406,7 +1406,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (HardwareConfigModem) # -GEN := $(intermediates)/android/hardware/radio/1.0/HardwareConfigModem.java +GEN := $(intermediates)/android/hardware/radio/V1_0/HardwareConfigModem.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1425,7 +1425,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (HardwareConfigSim) # -GEN := $(intermediates)/android/hardware/radio/1.0/HardwareConfigSim.java +GEN := $(intermediates)/android/hardware/radio/V1_0/HardwareConfigSim.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1444,7 +1444,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (HardwareConfigState) # -GEN := $(intermediates)/android/hardware/radio/1.0/HardwareConfigState.java +GEN := $(intermediates)/android/hardware/radio/V1_0/HardwareConfigState.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1463,7 +1463,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (HardwareConfigType) # -GEN := $(intermediates)/android/hardware/radio/1.0/HardwareConfigType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/HardwareConfigType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1482,7 +1482,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (IccIo) # -GEN := $(intermediates)/android/hardware/radio/1.0/IccIo.java +GEN := $(intermediates)/android/hardware/radio/V1_0/IccIo.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1501,7 +1501,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (IccIoResult) # -GEN := $(intermediates)/android/hardware/radio/1.0/IccIoResult.java +GEN := $(intermediates)/android/hardware/radio/V1_0/IccIoResult.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1520,7 +1520,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (ImsSmsMessage) # -GEN := $(intermediates)/android/hardware/radio/1.0/ImsSmsMessage.java +GEN := $(intermediates)/android/hardware/radio/V1_0/ImsSmsMessage.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1539,7 +1539,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (LastCallFailCause) # -GEN := $(intermediates)/android/hardware/radio/1.0/LastCallFailCause.java +GEN := $(intermediates)/android/hardware/radio/V1_0/LastCallFailCause.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1558,7 +1558,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (LceDataInfo) # -GEN := $(intermediates)/android/hardware/radio/1.0/LceDataInfo.java +GEN := $(intermediates)/android/hardware/radio/V1_0/LceDataInfo.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1577,7 +1577,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (LceStatus) # -GEN := $(intermediates)/android/hardware/radio/1.0/LceStatus.java +GEN := $(intermediates)/android/hardware/radio/V1_0/LceStatus.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1596,7 +1596,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (LceStatusInfo) # -GEN := $(intermediates)/android/hardware/radio/1.0/LceStatusInfo.java +GEN := $(intermediates)/android/hardware/radio/V1_0/LceStatusInfo.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1615,7 +1615,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (LteSignalStrength) # -GEN := $(intermediates)/android/hardware/radio/1.0/LteSignalStrength.java +GEN := $(intermediates)/android/hardware/radio/V1_0/LteSignalStrength.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1634,7 +1634,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NeighboringCell) # -GEN := $(intermediates)/android/hardware/radio/1.0/NeighboringCell.java +GEN := $(intermediates)/android/hardware/radio/V1_0/NeighboringCell.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1653,7 +1653,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NvItem) # -GEN := $(intermediates)/android/hardware/radio/1.0/NvItem.java +GEN := $(intermediates)/android/hardware/radio/V1_0/NvItem.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1672,7 +1672,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NvWriteItem) # -GEN := $(intermediates)/android/hardware/radio/1.0/NvWriteItem.java +GEN := $(intermediates)/android/hardware/radio/V1_0/NvWriteItem.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1691,7 +1691,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (OperatorInfo) # -GEN := $(intermediates)/android/hardware/radio/1.0/OperatorInfo.java +GEN := $(intermediates)/android/hardware/radio/V1_0/OperatorInfo.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1710,7 +1710,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (OperatorStatus) # -GEN := $(intermediates)/android/hardware/radio/1.0/OperatorStatus.java +GEN := $(intermediates)/android/hardware/radio/V1_0/OperatorStatus.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1729,7 +1729,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (PcoDataInfo) # -GEN := $(intermediates)/android/hardware/radio/1.0/PcoDataInfo.java +GEN := $(intermediates)/android/hardware/radio/V1_0/PcoDataInfo.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1748,7 +1748,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (PersoSubstate) # -GEN := $(intermediates)/android/hardware/radio/1.0/PersoSubstate.java +GEN := $(intermediates)/android/hardware/radio/V1_0/PersoSubstate.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1767,7 +1767,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (PhoneRestrictedState) # -GEN := $(intermediates)/android/hardware/radio/1.0/PhoneRestrictedState.java +GEN := $(intermediates)/android/hardware/radio/V1_0/PhoneRestrictedState.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1786,7 +1786,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (PinState) # -GEN := $(intermediates)/android/hardware/radio/1.0/PinState.java +GEN := $(intermediates)/android/hardware/radio/V1_0/PinState.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1805,7 +1805,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (PreferredNetworkType) # -GEN := $(intermediates)/android/hardware/radio/1.0/PreferredNetworkType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/PreferredNetworkType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1824,7 +1824,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RadioAccessFamily) # -GEN := $(intermediates)/android/hardware/radio/1.0/RadioAccessFamily.java +GEN := $(intermediates)/android/hardware/radio/V1_0/RadioAccessFamily.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1843,7 +1843,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RadioBandMode) # -GEN := $(intermediates)/android/hardware/radio/1.0/RadioBandMode.java +GEN := $(intermediates)/android/hardware/radio/V1_0/RadioBandMode.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1862,7 +1862,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RadioCapability) # -GEN := $(intermediates)/android/hardware/radio/1.0/RadioCapability.java +GEN := $(intermediates)/android/hardware/radio/V1_0/RadioCapability.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1881,7 +1881,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RadioCapabilityPhase) # -GEN := $(intermediates)/android/hardware/radio/1.0/RadioCapabilityPhase.java +GEN := $(intermediates)/android/hardware/radio/V1_0/RadioCapabilityPhase.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1900,7 +1900,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RadioCapabilityStatus) # -GEN := $(intermediates)/android/hardware/radio/1.0/RadioCapabilityStatus.java +GEN := $(intermediates)/android/hardware/radio/V1_0/RadioCapabilityStatus.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1919,7 +1919,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RadioCdmaSmsConst) # -GEN := $(intermediates)/android/hardware/radio/1.0/RadioCdmaSmsConst.java +GEN := $(intermediates)/android/hardware/radio/V1_0/RadioCdmaSmsConst.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1938,7 +1938,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RadioConst) # -GEN := $(intermediates)/android/hardware/radio/1.0/RadioConst.java +GEN := $(intermediates)/android/hardware/radio/V1_0/RadioConst.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1957,7 +1957,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RadioError) # -GEN := $(intermediates)/android/hardware/radio/1.0/RadioError.java +GEN := $(intermediates)/android/hardware/radio/V1_0/RadioError.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1976,7 +1976,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RadioIndicationType) # -GEN := $(intermediates)/android/hardware/radio/1.0/RadioIndicationType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/RadioIndicationType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1995,7 +1995,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RadioResponseInfo) # -GEN := $(intermediates)/android/hardware/radio/1.0/RadioResponseInfo.java +GEN := $(intermediates)/android/hardware/radio/V1_0/RadioResponseInfo.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2014,7 +2014,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RadioResponseType) # -GEN := $(intermediates)/android/hardware/radio/1.0/RadioResponseType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/RadioResponseType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2033,7 +2033,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RadioState) # -GEN := $(intermediates)/android/hardware/radio/1.0/RadioState.java +GEN := $(intermediates)/android/hardware/radio/V1_0/RadioState.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2052,7 +2052,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RadioTechnology) # -GEN := $(intermediates)/android/hardware/radio/1.0/RadioTechnology.java +GEN := $(intermediates)/android/hardware/radio/V1_0/RadioTechnology.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2071,7 +2071,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RadioTechnologyFamily) # -GEN := $(intermediates)/android/hardware/radio/1.0/RadioTechnologyFamily.java +GEN := $(intermediates)/android/hardware/radio/V1_0/RadioTechnologyFamily.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2090,7 +2090,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RegState) # -GEN := $(intermediates)/android/hardware/radio/1.0/RegState.java +GEN := $(intermediates)/android/hardware/radio/V1_0/RegState.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2109,7 +2109,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (ResetNvType) # -GEN := $(intermediates)/android/hardware/radio/1.0/ResetNvType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/ResetNvType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2128,7 +2128,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RestrictedState) # -GEN := $(intermediates)/android/hardware/radio/1.0/RestrictedState.java +GEN := $(intermediates)/android/hardware/radio/V1_0/RestrictedState.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2147,7 +2147,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SapApduType) # -GEN := $(intermediates)/android/hardware/radio/1.0/SapApduType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SapApduType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2166,7 +2166,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SapConnectRsp) # -GEN := $(intermediates)/android/hardware/radio/1.0/SapConnectRsp.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SapConnectRsp.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2185,7 +2185,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SapDisconnectType) # -GEN := $(intermediates)/android/hardware/radio/1.0/SapDisconnectType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SapDisconnectType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2204,7 +2204,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SapResultCode) # -GEN := $(intermediates)/android/hardware/radio/1.0/SapResultCode.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SapResultCode.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2223,7 +2223,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SapStatus) # -GEN := $(intermediates)/android/hardware/radio/1.0/SapStatus.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SapStatus.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2242,7 +2242,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SapTransferProtocol) # -GEN := $(intermediates)/android/hardware/radio/1.0/SapTransferProtocol.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SapTransferProtocol.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2261,7 +2261,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SelectUiccSub) # -GEN := $(intermediates)/android/hardware/radio/1.0/SelectUiccSub.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SelectUiccSub.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2280,7 +2280,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SendSmsResult) # -GEN := $(intermediates)/android/hardware/radio/1.0/SendSmsResult.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SendSmsResult.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2299,7 +2299,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SetupDataCallResult) # -GEN := $(intermediates)/android/hardware/radio/1.0/SetupDataCallResult.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SetupDataCallResult.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2318,7 +2318,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SignalStrength) # -GEN := $(intermediates)/android/hardware/radio/1.0/SignalStrength.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SignalStrength.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2337,7 +2337,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SimApdu) # -GEN := $(intermediates)/android/hardware/radio/1.0/SimApdu.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SimApdu.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2356,7 +2356,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SimRefreshResult) # -GEN := $(intermediates)/android/hardware/radio/1.0/SimRefreshResult.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SimRefreshResult.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2375,7 +2375,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SimRefreshType) # -GEN := $(intermediates)/android/hardware/radio/1.0/SimRefreshType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SimRefreshType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2394,7 +2394,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SmsAcknowledgeFailCause) # -GEN := $(intermediates)/android/hardware/radio/1.0/SmsAcknowledgeFailCause.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SmsAcknowledgeFailCause.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2413,7 +2413,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SmsWriteArgs) # -GEN := $(intermediates)/android/hardware/radio/1.0/SmsWriteArgs.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SmsWriteArgs.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2432,7 +2432,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SmsWriteArgsStatus) # -GEN := $(intermediates)/android/hardware/radio/1.0/SmsWriteArgsStatus.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SmsWriteArgsStatus.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2451,7 +2451,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SrvccState) # -GEN := $(intermediates)/android/hardware/radio/1.0/SrvccState.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SrvccState.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2470,7 +2470,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SsInfoData) # -GEN := $(intermediates)/android/hardware/radio/1.0/SsInfoData.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SsInfoData.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2489,7 +2489,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SsRequestType) # -GEN := $(intermediates)/android/hardware/radio/1.0/SsRequestType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SsRequestType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2508,7 +2508,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SsServiceType) # -GEN := $(intermediates)/android/hardware/radio/1.0/SsServiceType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SsServiceType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2527,7 +2527,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SsTeleserviceType) # -GEN := $(intermediates)/android/hardware/radio/1.0/SsTeleserviceType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SsTeleserviceType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2546,7 +2546,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (StkCcUnsolSsResult) # -GEN := $(intermediates)/android/hardware/radio/1.0/StkCcUnsolSsResult.java +GEN := $(intermediates)/android/hardware/radio/V1_0/StkCcUnsolSsResult.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2565,7 +2565,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SubscriptionType) # -GEN := $(intermediates)/android/hardware/radio/1.0/SubscriptionType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SubscriptionType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2584,7 +2584,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SuppServiceClass) # -GEN := $(intermediates)/android/hardware/radio/1.0/SuppServiceClass.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SuppServiceClass.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2603,7 +2603,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SuppSvcNotification) # -GEN := $(intermediates)/android/hardware/radio/1.0/SuppSvcNotification.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SuppSvcNotification.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2622,7 +2622,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (TdScdmaSignalStrength) # -GEN := $(intermediates)/android/hardware/radio/1.0/TdScdmaSignalStrength.java +GEN := $(intermediates)/android/hardware/radio/V1_0/TdScdmaSignalStrength.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2641,7 +2641,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (TimeStampType) # -GEN := $(intermediates)/android/hardware/radio/1.0/TimeStampType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/TimeStampType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2660,7 +2660,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (TtyMode) # -GEN := $(intermediates)/android/hardware/radio/1.0/TtyMode.java +GEN := $(intermediates)/android/hardware/radio/V1_0/TtyMode.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2679,7 +2679,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (UiccSubActStatus) # -GEN := $(intermediates)/android/hardware/radio/1.0/UiccSubActStatus.java +GEN := $(intermediates)/android/hardware/radio/V1_0/UiccSubActStatus.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2698,7 +2698,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (UssdModeType) # -GEN := $(intermediates)/android/hardware/radio/1.0/UssdModeType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/UssdModeType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2717,7 +2717,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (UusDcs) # -GEN := $(intermediates)/android/hardware/radio/1.0/UusDcs.java +GEN := $(intermediates)/android/hardware/radio/V1_0/UusDcs.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2736,7 +2736,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (UusInfo) # -GEN := $(intermediates)/android/hardware/radio/1.0/UusInfo.java +GEN := $(intermediates)/android/hardware/radio/V1_0/UusInfo.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2755,7 +2755,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (UusType) # -GEN := $(intermediates)/android/hardware/radio/1.0/UusType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/UusType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2774,7 +2774,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (VoiceRegStateResult) # -GEN := $(intermediates)/android/hardware/radio/1.0/VoiceRegStateResult.java +GEN := $(intermediates)/android/hardware/radio/V1_0/VoiceRegStateResult.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2793,7 +2793,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WcdmaSignalStrength) # -GEN := $(intermediates)/android/hardware/radio/1.0/WcdmaSignalStrength.java +GEN := $(intermediates)/android/hardware/radio/V1_0/WcdmaSignalStrength.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2812,7 +2812,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build IRadio.hal # -GEN := $(intermediates)/android/hardware/radio/1.0/IRadio.java +GEN := $(intermediates)/android/hardware/radio/V1_0/IRadio.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IRadio.hal @@ -2837,7 +2837,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build IRadioIndication.hal # -GEN := $(intermediates)/android/hardware/radio/1.0/IRadioIndication.java +GEN := $(intermediates)/android/hardware/radio/V1_0/IRadioIndication.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IRadioIndication.hal @@ -2858,7 +2858,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build IRadioResponse.hal # -GEN := $(intermediates)/android/hardware/radio/1.0/IRadioResponse.java +GEN := $(intermediates)/android/hardware/radio/V1_0/IRadioResponse.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IRadioResponse.hal @@ -2879,7 +2879,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build ISap.hal # -GEN := $(intermediates)/android/hardware/radio/1.0/ISap.java +GEN := $(intermediates)/android/hardware/radio/V1_0/ISap.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISap.hal @@ -2902,7 +2902,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build ISapCallback.hal # -GEN := $(intermediates)/android/hardware/radio/1.0/ISapCallback.java +GEN := $(intermediates)/android/hardware/radio/V1_0/ISapCallback.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISapCallback.hal @@ -2939,7 +2939,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ # # Build types.hal (ActivityStatsInfo) # -GEN := $(intermediates)/android/hardware/radio/1.0/ActivityStatsInfo.java +GEN := $(intermediates)/android/hardware/radio/V1_0/ActivityStatsInfo.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2958,7 +2958,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (ApnAuthType) # -GEN := $(intermediates)/android/hardware/radio/1.0/ApnAuthType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/ApnAuthType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2977,7 +2977,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (AppState) # -GEN := $(intermediates)/android/hardware/radio/1.0/AppState.java +GEN := $(intermediates)/android/hardware/radio/V1_0/AppState.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2996,7 +2996,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (AppStatus) # -GEN := $(intermediates)/android/hardware/radio/1.0/AppStatus.java +GEN := $(intermediates)/android/hardware/radio/V1_0/AppStatus.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3015,7 +3015,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (AppType) # -GEN := $(intermediates)/android/hardware/radio/1.0/AppType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/AppType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3034,7 +3034,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (Call) # -GEN := $(intermediates)/android/hardware/radio/1.0/Call.java +GEN := $(intermediates)/android/hardware/radio/V1_0/Call.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3053,7 +3053,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CallForwardInfo) # -GEN := $(intermediates)/android/hardware/radio/1.0/CallForwardInfo.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CallForwardInfo.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3072,7 +3072,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CallForwardInfoStatus) # -GEN := $(intermediates)/android/hardware/radio/1.0/CallForwardInfoStatus.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CallForwardInfoStatus.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3091,7 +3091,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CallPresentation) # -GEN := $(intermediates)/android/hardware/radio/1.0/CallPresentation.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CallPresentation.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3110,7 +3110,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CallState) # -GEN := $(intermediates)/android/hardware/radio/1.0/CallState.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CallState.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3129,7 +3129,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CardState) # -GEN := $(intermediates)/android/hardware/radio/1.0/CardState.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CardState.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3148,7 +3148,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CardStatus) # -GEN := $(intermediates)/android/hardware/radio/1.0/CardStatus.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CardStatus.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3167,7 +3167,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (Carrier) # -GEN := $(intermediates)/android/hardware/radio/1.0/Carrier.java +GEN := $(intermediates)/android/hardware/radio/V1_0/Carrier.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3186,7 +3186,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CarrierMatchType) # -GEN := $(intermediates)/android/hardware/radio/1.0/CarrierMatchType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CarrierMatchType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3205,7 +3205,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CarrierRestrictions) # -GEN := $(intermediates)/android/hardware/radio/1.0/CarrierRestrictions.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CarrierRestrictions.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3224,7 +3224,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaBroadcastSmsConfigInfo) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaBroadcastSmsConfigInfo.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaBroadcastSmsConfigInfo.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3243,7 +3243,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaCallWaiting) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaCallWaiting.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaCallWaiting.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3262,7 +3262,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaCallWaitingNumberPlan) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaCallWaitingNumberPlan.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaCallWaitingNumberPlan.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3281,7 +3281,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaCallWaitingNumberPresentation) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaCallWaitingNumberPresentation.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaCallWaitingNumberPresentation.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3300,7 +3300,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaCallWaitingNumberType) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaCallWaitingNumberType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaCallWaitingNumberType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3319,7 +3319,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaDisplayInfoRecord) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaDisplayInfoRecord.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaDisplayInfoRecord.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3338,7 +3338,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaInfoRecName) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaInfoRecName.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaInfoRecName.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3357,7 +3357,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaInformationRecord) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaInformationRecord.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaInformationRecord.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3376,7 +3376,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaInformationRecords) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaInformationRecords.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaInformationRecords.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3395,7 +3395,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaLineControlInfoRecord) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaLineControlInfoRecord.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaLineControlInfoRecord.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3414,7 +3414,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaNumberInfoRecord) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaNumberInfoRecord.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaNumberInfoRecord.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3433,7 +3433,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaOtaProvisionStatus) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaOtaProvisionStatus.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaOtaProvisionStatus.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3452,7 +3452,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaRedirectingNumberInfoRecord) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaRedirectingNumberInfoRecord.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaRedirectingNumberInfoRecord.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3471,7 +3471,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaRedirectingReason) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaRedirectingReason.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaRedirectingReason.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3490,7 +3490,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaRoamingType) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaRoamingType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaRoamingType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3509,7 +3509,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaSignalInfoRecord) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSignalInfoRecord.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSignalInfoRecord.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3528,7 +3528,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaSignalStrength) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSignalStrength.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSignalStrength.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3547,7 +3547,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaSmsAck) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsAck.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsAck.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3566,7 +3566,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaSmsAddress) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsAddress.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsAddress.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3585,7 +3585,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaSmsDigitMode) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsDigitMode.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsDigitMode.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3604,7 +3604,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaSmsErrorClass) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsErrorClass.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsErrorClass.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3623,7 +3623,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaSmsMessage) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsMessage.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsMessage.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3642,7 +3642,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaSmsNumberMode) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsNumberMode.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsNumberMode.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3661,7 +3661,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaSmsNumberPlan) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsNumberPlan.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsNumberPlan.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3680,7 +3680,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaSmsNumberType) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsNumberType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsNumberType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3699,7 +3699,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaSmsSubaddress) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsSubaddress.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsSubaddress.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3718,7 +3718,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaSmsSubaddressType) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsSubaddressType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsSubaddressType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3737,7 +3737,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaSmsWriteArgs) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsWriteArgs.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsWriteArgs.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3756,7 +3756,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaSmsWriteArgsStatus) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSmsWriteArgsStatus.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSmsWriteArgsStatus.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3775,7 +3775,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaSubscriptionSource) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaSubscriptionSource.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaSubscriptionSource.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3794,7 +3794,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaT53AudioControlInfoRecord) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaT53AudioControlInfoRecord.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaT53AudioControlInfoRecord.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3813,7 +3813,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CdmaT53ClirInfoRecord) # -GEN := $(intermediates)/android/hardware/radio/1.0/CdmaT53ClirInfoRecord.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CdmaT53ClirInfoRecord.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3832,7 +3832,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CellIdentityCdma) # -GEN := $(intermediates)/android/hardware/radio/1.0/CellIdentityCdma.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CellIdentityCdma.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3851,7 +3851,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CellIdentityGsm) # -GEN := $(intermediates)/android/hardware/radio/1.0/CellIdentityGsm.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CellIdentityGsm.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3870,7 +3870,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CellIdentityLte) # -GEN := $(intermediates)/android/hardware/radio/1.0/CellIdentityLte.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CellIdentityLte.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3889,7 +3889,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CellIdentityTdscdma) # -GEN := $(intermediates)/android/hardware/radio/1.0/CellIdentityTdscdma.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CellIdentityTdscdma.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3908,7 +3908,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CellIdentityWcdma) # -GEN := $(intermediates)/android/hardware/radio/1.0/CellIdentityWcdma.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CellIdentityWcdma.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3927,7 +3927,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CellInfo) # -GEN := $(intermediates)/android/hardware/radio/1.0/CellInfo.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CellInfo.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3946,7 +3946,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CellInfoCdma) # -GEN := $(intermediates)/android/hardware/radio/1.0/CellInfoCdma.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CellInfoCdma.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3965,7 +3965,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CellInfoGsm) # -GEN := $(intermediates)/android/hardware/radio/1.0/CellInfoGsm.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CellInfoGsm.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3984,7 +3984,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CellInfoLte) # -GEN := $(intermediates)/android/hardware/radio/1.0/CellInfoLte.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CellInfoLte.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4003,7 +4003,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CellInfoTdscdma) # -GEN := $(intermediates)/android/hardware/radio/1.0/CellInfoTdscdma.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CellInfoTdscdma.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4022,7 +4022,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CellInfoType) # -GEN := $(intermediates)/android/hardware/radio/1.0/CellInfoType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CellInfoType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4041,7 +4041,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CellInfoWcdma) # -GEN := $(intermediates)/android/hardware/radio/1.0/CellInfoWcdma.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CellInfoWcdma.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4060,7 +4060,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (CfData) # -GEN := $(intermediates)/android/hardware/radio/1.0/CfData.java +GEN := $(intermediates)/android/hardware/radio/V1_0/CfData.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4079,7 +4079,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (ClipStatus) # -GEN := $(intermediates)/android/hardware/radio/1.0/ClipStatus.java +GEN := $(intermediates)/android/hardware/radio/V1_0/ClipStatus.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4098,7 +4098,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (Clir) # -GEN := $(intermediates)/android/hardware/radio/1.0/Clir.java +GEN := $(intermediates)/android/hardware/radio/V1_0/Clir.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4117,7 +4117,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (DataCallFailCause) # -GEN := $(intermediates)/android/hardware/radio/1.0/DataCallFailCause.java +GEN := $(intermediates)/android/hardware/radio/V1_0/DataCallFailCause.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4136,7 +4136,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (DataProfile) # -GEN := $(intermediates)/android/hardware/radio/1.0/DataProfile.java +GEN := $(intermediates)/android/hardware/radio/V1_0/DataProfile.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4155,7 +4155,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (DataProfileInfo) # -GEN := $(intermediates)/android/hardware/radio/1.0/DataProfileInfo.java +GEN := $(intermediates)/android/hardware/radio/V1_0/DataProfileInfo.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4174,7 +4174,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (DataProfileInfoType) # -GEN := $(intermediates)/android/hardware/radio/1.0/DataProfileInfoType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/DataProfileInfoType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4193,7 +4193,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (DataRegStateResult) # -GEN := $(intermediates)/android/hardware/radio/1.0/DataRegStateResult.java +GEN := $(intermediates)/android/hardware/radio/V1_0/DataRegStateResult.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4212,7 +4212,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (Dial) # -GEN := $(intermediates)/android/hardware/radio/1.0/Dial.java +GEN := $(intermediates)/android/hardware/radio/V1_0/Dial.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4231,7 +4231,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (EvdoSignalStrength) # -GEN := $(intermediates)/android/hardware/radio/1.0/EvdoSignalStrength.java +GEN := $(intermediates)/android/hardware/radio/V1_0/EvdoSignalStrength.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4250,7 +4250,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (GsmBroadcastSmsConfigInfo) # -GEN := $(intermediates)/android/hardware/radio/1.0/GsmBroadcastSmsConfigInfo.java +GEN := $(intermediates)/android/hardware/radio/V1_0/GsmBroadcastSmsConfigInfo.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4269,7 +4269,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (GsmSignalStrength) # -GEN := $(intermediates)/android/hardware/radio/1.0/GsmSignalStrength.java +GEN := $(intermediates)/android/hardware/radio/V1_0/GsmSignalStrength.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4288,7 +4288,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (GsmSmsMessage) # -GEN := $(intermediates)/android/hardware/radio/1.0/GsmSmsMessage.java +GEN := $(intermediates)/android/hardware/radio/V1_0/GsmSmsMessage.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4307,7 +4307,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (HardwareConfig) # -GEN := $(intermediates)/android/hardware/radio/1.0/HardwareConfig.java +GEN := $(intermediates)/android/hardware/radio/V1_0/HardwareConfig.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4326,7 +4326,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (HardwareConfigModem) # -GEN := $(intermediates)/android/hardware/radio/1.0/HardwareConfigModem.java +GEN := $(intermediates)/android/hardware/radio/V1_0/HardwareConfigModem.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4345,7 +4345,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (HardwareConfigSim) # -GEN := $(intermediates)/android/hardware/radio/1.0/HardwareConfigSim.java +GEN := $(intermediates)/android/hardware/radio/V1_0/HardwareConfigSim.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4364,7 +4364,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (HardwareConfigState) # -GEN := $(intermediates)/android/hardware/radio/1.0/HardwareConfigState.java +GEN := $(intermediates)/android/hardware/radio/V1_0/HardwareConfigState.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4383,7 +4383,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (HardwareConfigType) # -GEN := $(intermediates)/android/hardware/radio/1.0/HardwareConfigType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/HardwareConfigType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4402,7 +4402,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (IccIo) # -GEN := $(intermediates)/android/hardware/radio/1.0/IccIo.java +GEN := $(intermediates)/android/hardware/radio/V1_0/IccIo.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4421,7 +4421,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (IccIoResult) # -GEN := $(intermediates)/android/hardware/radio/1.0/IccIoResult.java +GEN := $(intermediates)/android/hardware/radio/V1_0/IccIoResult.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4440,7 +4440,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (ImsSmsMessage) # -GEN := $(intermediates)/android/hardware/radio/1.0/ImsSmsMessage.java +GEN := $(intermediates)/android/hardware/radio/V1_0/ImsSmsMessage.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4459,7 +4459,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (LastCallFailCause) # -GEN := $(intermediates)/android/hardware/radio/1.0/LastCallFailCause.java +GEN := $(intermediates)/android/hardware/radio/V1_0/LastCallFailCause.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4478,7 +4478,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (LceDataInfo) # -GEN := $(intermediates)/android/hardware/radio/1.0/LceDataInfo.java +GEN := $(intermediates)/android/hardware/radio/V1_0/LceDataInfo.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4497,7 +4497,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (LceStatus) # -GEN := $(intermediates)/android/hardware/radio/1.0/LceStatus.java +GEN := $(intermediates)/android/hardware/radio/V1_0/LceStatus.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4516,7 +4516,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (LceStatusInfo) # -GEN := $(intermediates)/android/hardware/radio/1.0/LceStatusInfo.java +GEN := $(intermediates)/android/hardware/radio/V1_0/LceStatusInfo.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4535,7 +4535,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (LteSignalStrength) # -GEN := $(intermediates)/android/hardware/radio/1.0/LteSignalStrength.java +GEN := $(intermediates)/android/hardware/radio/V1_0/LteSignalStrength.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4554,7 +4554,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NeighboringCell) # -GEN := $(intermediates)/android/hardware/radio/1.0/NeighboringCell.java +GEN := $(intermediates)/android/hardware/radio/V1_0/NeighboringCell.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4573,7 +4573,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NvItem) # -GEN := $(intermediates)/android/hardware/radio/1.0/NvItem.java +GEN := $(intermediates)/android/hardware/radio/V1_0/NvItem.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4592,7 +4592,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NvWriteItem) # -GEN := $(intermediates)/android/hardware/radio/1.0/NvWriteItem.java +GEN := $(intermediates)/android/hardware/radio/V1_0/NvWriteItem.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4611,7 +4611,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (OperatorInfo) # -GEN := $(intermediates)/android/hardware/radio/1.0/OperatorInfo.java +GEN := $(intermediates)/android/hardware/radio/V1_0/OperatorInfo.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4630,7 +4630,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (OperatorStatus) # -GEN := $(intermediates)/android/hardware/radio/1.0/OperatorStatus.java +GEN := $(intermediates)/android/hardware/radio/V1_0/OperatorStatus.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4649,7 +4649,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (PcoDataInfo) # -GEN := $(intermediates)/android/hardware/radio/1.0/PcoDataInfo.java +GEN := $(intermediates)/android/hardware/radio/V1_0/PcoDataInfo.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4668,7 +4668,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (PersoSubstate) # -GEN := $(intermediates)/android/hardware/radio/1.0/PersoSubstate.java +GEN := $(intermediates)/android/hardware/radio/V1_0/PersoSubstate.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4687,7 +4687,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (PhoneRestrictedState) # -GEN := $(intermediates)/android/hardware/radio/1.0/PhoneRestrictedState.java +GEN := $(intermediates)/android/hardware/radio/V1_0/PhoneRestrictedState.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4706,7 +4706,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (PinState) # -GEN := $(intermediates)/android/hardware/radio/1.0/PinState.java +GEN := $(intermediates)/android/hardware/radio/V1_0/PinState.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4725,7 +4725,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (PreferredNetworkType) # -GEN := $(intermediates)/android/hardware/radio/1.0/PreferredNetworkType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/PreferredNetworkType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4744,7 +4744,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RadioAccessFamily) # -GEN := $(intermediates)/android/hardware/radio/1.0/RadioAccessFamily.java +GEN := $(intermediates)/android/hardware/radio/V1_0/RadioAccessFamily.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4763,7 +4763,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RadioBandMode) # -GEN := $(intermediates)/android/hardware/radio/1.0/RadioBandMode.java +GEN := $(intermediates)/android/hardware/radio/V1_0/RadioBandMode.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4782,7 +4782,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RadioCapability) # -GEN := $(intermediates)/android/hardware/radio/1.0/RadioCapability.java +GEN := $(intermediates)/android/hardware/radio/V1_0/RadioCapability.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4801,7 +4801,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RadioCapabilityPhase) # -GEN := $(intermediates)/android/hardware/radio/1.0/RadioCapabilityPhase.java +GEN := $(intermediates)/android/hardware/radio/V1_0/RadioCapabilityPhase.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4820,7 +4820,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RadioCapabilityStatus) # -GEN := $(intermediates)/android/hardware/radio/1.0/RadioCapabilityStatus.java +GEN := $(intermediates)/android/hardware/radio/V1_0/RadioCapabilityStatus.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4839,7 +4839,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RadioCdmaSmsConst) # -GEN := $(intermediates)/android/hardware/radio/1.0/RadioCdmaSmsConst.java +GEN := $(intermediates)/android/hardware/radio/V1_0/RadioCdmaSmsConst.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4858,7 +4858,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RadioConst) # -GEN := $(intermediates)/android/hardware/radio/1.0/RadioConst.java +GEN := $(intermediates)/android/hardware/radio/V1_0/RadioConst.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4877,7 +4877,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RadioError) # -GEN := $(intermediates)/android/hardware/radio/1.0/RadioError.java +GEN := $(intermediates)/android/hardware/radio/V1_0/RadioError.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4896,7 +4896,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RadioIndicationType) # -GEN := $(intermediates)/android/hardware/radio/1.0/RadioIndicationType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/RadioIndicationType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4915,7 +4915,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RadioResponseInfo) # -GEN := $(intermediates)/android/hardware/radio/1.0/RadioResponseInfo.java +GEN := $(intermediates)/android/hardware/radio/V1_0/RadioResponseInfo.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4934,7 +4934,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RadioResponseType) # -GEN := $(intermediates)/android/hardware/radio/1.0/RadioResponseType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/RadioResponseType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4953,7 +4953,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RadioState) # -GEN := $(intermediates)/android/hardware/radio/1.0/RadioState.java +GEN := $(intermediates)/android/hardware/radio/V1_0/RadioState.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4972,7 +4972,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RadioTechnology) # -GEN := $(intermediates)/android/hardware/radio/1.0/RadioTechnology.java +GEN := $(intermediates)/android/hardware/radio/V1_0/RadioTechnology.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4991,7 +4991,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RadioTechnologyFamily) # -GEN := $(intermediates)/android/hardware/radio/1.0/RadioTechnologyFamily.java +GEN := $(intermediates)/android/hardware/radio/V1_0/RadioTechnologyFamily.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -5010,7 +5010,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RegState) # -GEN := $(intermediates)/android/hardware/radio/1.0/RegState.java +GEN := $(intermediates)/android/hardware/radio/V1_0/RegState.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -5029,7 +5029,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (ResetNvType) # -GEN := $(intermediates)/android/hardware/radio/1.0/ResetNvType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/ResetNvType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -5048,7 +5048,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RestrictedState) # -GEN := $(intermediates)/android/hardware/radio/1.0/RestrictedState.java +GEN := $(intermediates)/android/hardware/radio/V1_0/RestrictedState.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -5067,7 +5067,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SapApduType) # -GEN := $(intermediates)/android/hardware/radio/1.0/SapApduType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SapApduType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -5086,7 +5086,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SapConnectRsp) # -GEN := $(intermediates)/android/hardware/radio/1.0/SapConnectRsp.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SapConnectRsp.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -5105,7 +5105,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SapDisconnectType) # -GEN := $(intermediates)/android/hardware/radio/1.0/SapDisconnectType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SapDisconnectType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -5124,7 +5124,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SapResultCode) # -GEN := $(intermediates)/android/hardware/radio/1.0/SapResultCode.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SapResultCode.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -5143,7 +5143,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SapStatus) # -GEN := $(intermediates)/android/hardware/radio/1.0/SapStatus.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SapStatus.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -5162,7 +5162,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SapTransferProtocol) # -GEN := $(intermediates)/android/hardware/radio/1.0/SapTransferProtocol.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SapTransferProtocol.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -5181,7 +5181,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SelectUiccSub) # -GEN := $(intermediates)/android/hardware/radio/1.0/SelectUiccSub.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SelectUiccSub.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -5200,7 +5200,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SendSmsResult) # -GEN := $(intermediates)/android/hardware/radio/1.0/SendSmsResult.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SendSmsResult.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -5219,7 +5219,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SetupDataCallResult) # -GEN := $(intermediates)/android/hardware/radio/1.0/SetupDataCallResult.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SetupDataCallResult.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -5238,7 +5238,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SignalStrength) # -GEN := $(intermediates)/android/hardware/radio/1.0/SignalStrength.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SignalStrength.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -5257,7 +5257,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SimApdu) # -GEN := $(intermediates)/android/hardware/radio/1.0/SimApdu.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SimApdu.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -5276,7 +5276,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SimRefreshResult) # -GEN := $(intermediates)/android/hardware/radio/1.0/SimRefreshResult.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SimRefreshResult.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -5295,7 +5295,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SimRefreshType) # -GEN := $(intermediates)/android/hardware/radio/1.0/SimRefreshType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SimRefreshType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -5314,7 +5314,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SmsAcknowledgeFailCause) # -GEN := $(intermediates)/android/hardware/radio/1.0/SmsAcknowledgeFailCause.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SmsAcknowledgeFailCause.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -5333,7 +5333,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SmsWriteArgs) # -GEN := $(intermediates)/android/hardware/radio/1.0/SmsWriteArgs.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SmsWriteArgs.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -5352,7 +5352,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SmsWriteArgsStatus) # -GEN := $(intermediates)/android/hardware/radio/1.0/SmsWriteArgsStatus.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SmsWriteArgsStatus.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -5371,7 +5371,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SrvccState) # -GEN := $(intermediates)/android/hardware/radio/1.0/SrvccState.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SrvccState.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -5390,7 +5390,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SsInfoData) # -GEN := $(intermediates)/android/hardware/radio/1.0/SsInfoData.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SsInfoData.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -5409,7 +5409,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SsRequestType) # -GEN := $(intermediates)/android/hardware/radio/1.0/SsRequestType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SsRequestType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -5428,7 +5428,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SsServiceType) # -GEN := $(intermediates)/android/hardware/radio/1.0/SsServiceType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SsServiceType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -5447,7 +5447,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SsTeleserviceType) # -GEN := $(intermediates)/android/hardware/radio/1.0/SsTeleserviceType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SsTeleserviceType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -5466,7 +5466,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (StkCcUnsolSsResult) # -GEN := $(intermediates)/android/hardware/radio/1.0/StkCcUnsolSsResult.java +GEN := $(intermediates)/android/hardware/radio/V1_0/StkCcUnsolSsResult.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -5485,7 +5485,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SubscriptionType) # -GEN := $(intermediates)/android/hardware/radio/1.0/SubscriptionType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SubscriptionType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -5504,7 +5504,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SuppServiceClass) # -GEN := $(intermediates)/android/hardware/radio/1.0/SuppServiceClass.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SuppServiceClass.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -5523,7 +5523,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (SuppSvcNotification) # -GEN := $(intermediates)/android/hardware/radio/1.0/SuppSvcNotification.java +GEN := $(intermediates)/android/hardware/radio/V1_0/SuppSvcNotification.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -5542,7 +5542,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (TdScdmaSignalStrength) # -GEN := $(intermediates)/android/hardware/radio/1.0/TdScdmaSignalStrength.java +GEN := $(intermediates)/android/hardware/radio/V1_0/TdScdmaSignalStrength.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -5561,7 +5561,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (TimeStampType) # -GEN := $(intermediates)/android/hardware/radio/1.0/TimeStampType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/TimeStampType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -5580,7 +5580,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (TtyMode) # -GEN := $(intermediates)/android/hardware/radio/1.0/TtyMode.java +GEN := $(intermediates)/android/hardware/radio/V1_0/TtyMode.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -5599,7 +5599,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (UiccSubActStatus) # -GEN := $(intermediates)/android/hardware/radio/1.0/UiccSubActStatus.java +GEN := $(intermediates)/android/hardware/radio/V1_0/UiccSubActStatus.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -5618,7 +5618,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (UssdModeType) # -GEN := $(intermediates)/android/hardware/radio/1.0/UssdModeType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/UssdModeType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -5637,7 +5637,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (UusDcs) # -GEN := $(intermediates)/android/hardware/radio/1.0/UusDcs.java +GEN := $(intermediates)/android/hardware/radio/V1_0/UusDcs.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -5656,7 +5656,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (UusInfo) # -GEN := $(intermediates)/android/hardware/radio/1.0/UusInfo.java +GEN := $(intermediates)/android/hardware/radio/V1_0/UusInfo.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -5675,7 +5675,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (UusType) # -GEN := $(intermediates)/android/hardware/radio/1.0/UusType.java +GEN := $(intermediates)/android/hardware/radio/V1_0/UusType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -5694,7 +5694,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (VoiceRegStateResult) # -GEN := $(intermediates)/android/hardware/radio/1.0/VoiceRegStateResult.java +GEN := $(intermediates)/android/hardware/radio/V1_0/VoiceRegStateResult.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -5713,7 +5713,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WcdmaSignalStrength) # -GEN := $(intermediates)/android/hardware/radio/1.0/WcdmaSignalStrength.java +GEN := $(intermediates)/android/hardware/radio/V1_0/WcdmaSignalStrength.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -5732,7 +5732,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build IRadio.hal # -GEN := $(intermediates)/android/hardware/radio/1.0/IRadio.java +GEN := $(intermediates)/android/hardware/radio/V1_0/IRadio.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IRadio.hal @@ -5757,7 +5757,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build IRadioIndication.hal # -GEN := $(intermediates)/android/hardware/radio/1.0/IRadioIndication.java +GEN := $(intermediates)/android/hardware/radio/V1_0/IRadioIndication.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IRadioIndication.hal @@ -5778,7 +5778,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build IRadioResponse.hal # -GEN := $(intermediates)/android/hardware/radio/1.0/IRadioResponse.java +GEN := $(intermediates)/android/hardware/radio/V1_0/IRadioResponse.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IRadioResponse.hal @@ -5799,7 +5799,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build ISap.hal # -GEN := $(intermediates)/android/hardware/radio/1.0/ISap.java +GEN := $(intermediates)/android/hardware/radio/V1_0/ISap.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISap.hal @@ -5822,7 +5822,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build ISapCallback.hal # -GEN := $(intermediates)/android/hardware/radio/1.0/ISapCallback.java +GEN := $(intermediates)/android/hardware/radio/V1_0/ISapCallback.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISapCallback.hal diff --git a/tests/baz/1.0/Android.mk b/tests/baz/1.0/Android.mk index a27de712e8..82ba3cb87f 100644 --- a/tests/baz/1.0/Android.mk +++ b/tests/baz/1.0/Android.mk @@ -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 diff --git a/tests/expression/1.0/Android.mk b/tests/expression/1.0/Android.mk index 640978fd5c..1c7da4b13e 100644 --- a/tests/expression/1.0/Android.mk +++ b/tests/expression/1.0/Android.mk @@ -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 diff --git a/tests/inheritance/1.0/Android.mk b/tests/inheritance/1.0/Android.mk index 17d293036d..8c1b1c8da1 100644 --- a/tests/inheritance/1.0/Android.mk +++ b/tests/inheritance/1.0/Android.mk @@ -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 diff --git a/tests/libhwbinder/1.0/Android.mk b/tests/libhwbinder/1.0/Android.mk index 32a4fedd74..ae873af0c0 100644 --- a/tests/libhwbinder/1.0/Android.mk +++ b/tests/libhwbinder/1.0/Android.mk @@ -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 diff --git a/wifi/1.0/Android.mk b/wifi/1.0/Android.mk index 254a15a750..ee7f9803d1 100644 --- a/wifi/1.0/Android.mk +++ b/wifi/1.0/Android.mk @@ -19,7 +19,7 @@ LOCAL_JAVA_LIBRARIES := \ # # Build types.hal (IfaceType) # -GEN := $(intermediates)/android/hardware/wifi/1.0/IfaceType.java +GEN := $(intermediates)/android/hardware/wifi/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 (NanAvailDuration) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanAvailDuration.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanAvailDuration.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 (NanBeaconSdfPayloadInd) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanBeaconSdfPayloadInd.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanBeaconSdfPayloadInd.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -76,7 +76,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanBeaconSdfPayloadReceive) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanBeaconSdfPayloadReceive.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanBeaconSdfPayloadReceive.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -95,7 +95,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanBeaconSdfPayloadRequest) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanBeaconSdfPayloadRequest.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanBeaconSdfPayloadRequest.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -114,7 +114,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanCapabilitiesResponse) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanCapabilitiesResponse.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanCapabilitiesResponse.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -133,7 +133,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanCapabilitiesResponseMsg) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanCapabilitiesResponseMsg.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanCapabilitiesResponseMsg.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -152,7 +152,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanChannelIndex) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanChannelIndex.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanChannelIndex.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -171,7 +171,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanConfigRequest) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanConfigRequest.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanConfigRequest.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -190,7 +190,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanConnectionType) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanConnectionType.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanConnectionType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -209,7 +209,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanDataPathAppInfo) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathAppInfo.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathAppInfo.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -228,7 +228,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanDataPathCfg) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathCfg.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathCfg.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -247,7 +247,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanDataPathChannelCfg) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathChannelCfg.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathChannelCfg.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -266,7 +266,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanDataPathConfirmInd) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathConfirmInd.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathConfirmInd.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -285,7 +285,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanDataPathEndInd) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathEndInd.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathEndInd.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -304,7 +304,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanDataPathEndRequest) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathEndRequest.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathEndRequest.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -323,7 +323,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanDataPathIndicationResponse) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathIndicationResponse.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathIndicationResponse.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -342,7 +342,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanDataPathInitiatorRequest) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathInitiatorRequest.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathInitiatorRequest.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -361,7 +361,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanDataPathRequestInd) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathRequestInd.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathRequestInd.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -380,7 +380,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanDataPathResponse) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathResponse.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathResponse.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -399,7 +399,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanDataPathResponseCode) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathResponseCode.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathResponseCode.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -418,7 +418,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanDataPathResponseMsg) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathResponseMsg.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathResponseMsg.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -437,7 +437,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanDeviceRole) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanDeviceRole.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDeviceRole.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -456,7 +456,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanDisabledInd) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanDisabledInd.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDisabledInd.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -475,7 +475,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanDiscEngEventInd) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanDiscEngEventInd.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDiscEngEventInd.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -494,7 +494,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanDiscEngEventType) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanDiscEngEventType.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDiscEngEventType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -513,7 +513,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanEnableRequest) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanEnableRequest.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanEnableRequest.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -532,7 +532,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanFollowupInd) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanFollowupInd.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanFollowupInd.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -551,7 +551,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanFurtherAvailabilityChannel) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanFurtherAvailabilityChannel.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanFurtherAvailabilityChannel.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -570,7 +570,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanMatchAlg) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanMatchAlg.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanMatchAlg.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -589,7 +589,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanMatchExpiredInd) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanMatchExpiredInd.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanMatchExpiredInd.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -608,7 +608,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanMatchInd) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanMatchInd.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanMatchInd.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -627,7 +627,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanMaxSize) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanMaxSize.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanMaxSize.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -646,7 +646,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanPublishCancelRequest) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanPublishCancelRequest.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanPublishCancelRequest.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -665,7 +665,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanPublishRequest) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanPublishRequest.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanPublishRequest.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -684,7 +684,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanPublishResponse) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanPublishResponse.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanPublishResponse.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -703,7 +703,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanPublishResponseMsg) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanPublishResponseMsg.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanPublishResponseMsg.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -722,7 +722,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanPublishTerminatedInd) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanPublishTerminatedInd.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanPublishTerminatedInd.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -741,7 +741,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanPublishType) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanPublishType.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanPublishType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -760,7 +760,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanReceiveVendorSpecificAttribute) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanReceiveVendorSpecificAttribute.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanReceiveVendorSpecificAttribute.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -779,7 +779,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanResponseMsgHeader) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanResponseMsgHeader.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanResponseMsgHeader.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -798,7 +798,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanResponseType) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanResponseType.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanResponseType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -817,7 +817,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanSocialChannelScanParams) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanSocialChannelScanParams.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanSocialChannelScanParams.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -836,7 +836,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanSrfIncludeType) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanSrfIncludeType.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanSrfIncludeType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -855,7 +855,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanSrfType) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanSrfType.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanSrfType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -874,7 +874,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanStatusType) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanStatusType.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanStatusType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -893,7 +893,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanSubscribeCancelRequest) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanSubscribeCancelRequest.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanSubscribeCancelRequest.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -912,7 +912,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanSubscribeRequest) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanSubscribeRequest.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanSubscribeRequest.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -931,7 +931,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanSubscribeResponse) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanSubscribeResponse.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanSubscribeResponse.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -950,7 +950,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanSubscribeResponseMsg) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanSubscribeResponseMsg.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanSubscribeResponseMsg.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -969,7 +969,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanSubscribeTerminatedInd) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanSubscribeTerminatedInd.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanSubscribeTerminatedInd.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -988,7 +988,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanSubscribeType) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanSubscribeType.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanSubscribeType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1007,7 +1007,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanTransmitFollowupInd) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanTransmitFollowupInd.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanTransmitFollowupInd.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1026,7 +1026,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanTransmitFollowupRequest) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanTransmitFollowupRequest.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanTransmitFollowupRequest.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1045,7 +1045,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanTransmitVendorSpecificAttribute) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanTransmitVendorSpecificAttribute.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanTransmitVendorSpecificAttribute.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1064,7 +1064,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanTransmitWindowType) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanTransmitWindowType.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanTransmitWindowType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1083,7 +1083,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanTxPriority) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanTxPriority.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanTxPriority.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1102,7 +1102,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanTxType) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanTxType.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanTxType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1121,7 +1121,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanVsaRxFrameMask) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanVsaRxFrameMask.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanVsaRxFrameMask.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1140,7 +1140,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RttBw) # -GEN := $(intermediates)/android/hardware/wifi/1.0/RttBw.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/RttBw.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1159,7 +1159,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RttCapabilities) # -GEN := $(intermediates)/android/hardware/wifi/1.0/RttCapabilities.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/RttCapabilities.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1178,7 +1178,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RttConfig) # -GEN := $(intermediates)/android/hardware/wifi/1.0/RttConfig.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/RttConfig.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1197,7 +1197,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RttLciInformation) # -GEN := $(intermediates)/android/hardware/wifi/1.0/RttLciInformation.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/RttLciInformation.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1216,7 +1216,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RttLcrInformation) # -GEN := $(intermediates)/android/hardware/wifi/1.0/RttLcrInformation.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/RttLcrInformation.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1235,7 +1235,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RttMotionPattern) # -GEN := $(intermediates)/android/hardware/wifi/1.0/RttMotionPattern.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/RttMotionPattern.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1254,7 +1254,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RttPeerType) # -GEN := $(intermediates)/android/hardware/wifi/1.0/RttPeerType.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/RttPeerType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1273,7 +1273,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RttPreamble) # -GEN := $(intermediates)/android/hardware/wifi/1.0/RttPreamble.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/RttPreamble.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1292,7 +1292,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RttResponder) # -GEN := $(intermediates)/android/hardware/wifi/1.0/RttResponder.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/RttResponder.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1311,7 +1311,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RttResult) # -GEN := $(intermediates)/android/hardware/wifi/1.0/RttResult.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/RttResult.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1330,7 +1330,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RttStatus) # -GEN := $(intermediates)/android/hardware/wifi/1.0/RttStatus.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/RttStatus.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1349,7 +1349,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RttType) # -GEN := $(intermediates)/android/hardware/wifi/1.0/RttType.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/RttType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1368,7 +1368,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (StaApfPacketFilterCapabilities) # -GEN := $(intermediates)/android/hardware/wifi/1.0/StaApfPacketFilterCapabilities.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/StaApfPacketFilterCapabilities.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1387,7 +1387,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (StaBackgroundScanBand) # -GEN := $(intermediates)/android/hardware/wifi/1.0/StaBackgroundScanBand.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/StaBackgroundScanBand.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1406,7 +1406,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (StaBackgroundScanBucketEventReportSchemeMask) # -GEN := $(intermediates)/android/hardware/wifi/1.0/StaBackgroundScanBucketEventReportSchemeMask.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/StaBackgroundScanBucketEventReportSchemeMask.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1425,7 +1425,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (StaBackgroundScanBucketParameters) # -GEN := $(intermediates)/android/hardware/wifi/1.0/StaBackgroundScanBucketParameters.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/StaBackgroundScanBucketParameters.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1444,7 +1444,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (StaBackgroundScanCapabilities) # -GEN := $(intermediates)/android/hardware/wifi/1.0/StaBackgroundScanCapabilities.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/StaBackgroundScanCapabilities.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1463,7 +1463,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (StaBackgroundScanParameters) # -GEN := $(intermediates)/android/hardware/wifi/1.0/StaBackgroundScanParameters.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/StaBackgroundScanParameters.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1482,7 +1482,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (StaLinkLayerIfacePacketStats) # -GEN := $(intermediates)/android/hardware/wifi/1.0/StaLinkLayerIfacePacketStats.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/StaLinkLayerIfacePacketStats.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1501,7 +1501,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (StaLinkLayerIfaceStats) # -GEN := $(intermediates)/android/hardware/wifi/1.0/StaLinkLayerIfaceStats.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/StaLinkLayerIfaceStats.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1520,7 +1520,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (StaLinkLayerRadioStats) # -GEN := $(intermediates)/android/hardware/wifi/1.0/StaLinkLayerRadioStats.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/StaLinkLayerRadioStats.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1539,7 +1539,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (StaLinkLayerStats) # -GEN := $(intermediates)/android/hardware/wifi/1.0/StaLinkLayerStats.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/StaLinkLayerStats.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1558,7 +1558,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (StaScanData) # -GEN := $(intermediates)/android/hardware/wifi/1.0/StaScanData.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/StaScanData.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1577,7 +1577,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (StaScanDataFlagMask) # -GEN := $(intermediates)/android/hardware/wifi/1.0/StaScanDataFlagMask.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/StaScanDataFlagMask.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1596,7 +1596,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (StaScanResult) # -GEN := $(intermediates)/android/hardware/wifi/1.0/StaScanResult.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/StaScanResult.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1615,7 +1615,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiChannelInfo) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiChannelInfo.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiChannelInfo.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1634,7 +1634,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiChannelWidthInMhz) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiChannelWidthInMhz.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiChannelWidthInMhz.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1653,7 +1653,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugHostWakeReasonRxIcmpPacketDetails) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugHostWakeReasonRxIcmpPacketDetails.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugHostWakeReasonRxIcmpPacketDetails.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1672,7 +1672,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugHostWakeReasonRxMulticastPacketDetails) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugHostWakeReasonRxMulticastPacketDetails.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugHostWakeReasonRxMulticastPacketDetails.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1691,7 +1691,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugHostWakeReasonRxPacketDetails) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugHostWakeReasonRxPacketDetails.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugHostWakeReasonRxPacketDetails.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1710,7 +1710,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugHostWakeReasonStats) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugHostWakeReasonStats.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugHostWakeReasonStats.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1729,7 +1729,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugPacketFateFrameInfo) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugPacketFateFrameInfo.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugPacketFateFrameInfo.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1748,7 +1748,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugPacketFateFrameType) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugPacketFateFrameType.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugPacketFateFrameType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1767,7 +1767,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugRingBufferFlags) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingBufferFlags.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingBufferFlags.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1786,7 +1786,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugRingBufferStatus) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingBufferStatus.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingBufferStatus.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1805,7 +1805,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugRingBufferVerboseLevel) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingBufferVerboseLevel.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingBufferVerboseLevel.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1824,7 +1824,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugRingEntryConnectivityEvent) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingEntryConnectivityEvent.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingEntryConnectivityEvent.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1843,7 +1843,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugRingEntryEventTlv) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingEntryEventTlv.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingEntryEventTlv.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1862,7 +1862,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugRingEntryEventTlvType) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingEntryEventTlvType.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingEntryEventTlvType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1881,7 +1881,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugRingEntryEventType) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingEntryEventType.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingEntryEventType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1900,7 +1900,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugRingEntryFlags) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingEntryFlags.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingEntryFlags.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1919,7 +1919,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugRingEntryHeader) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingEntryHeader.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingEntryHeader.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1938,7 +1938,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugRingEntryPowerEvent) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingEntryPowerEvent.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingEntryPowerEvent.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1957,7 +1957,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugRingEntryVendorData) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingEntryVendorData.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingEntryVendorData.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1976,7 +1976,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugRingEntryWakelockEvent) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingEntryWakelockEvent.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingEntryWakelockEvent.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -1995,7 +1995,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugRxPacketFate) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRxPacketFate.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRxPacketFate.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2014,7 +2014,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugRxPacketFateReport) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRxPacketFateReport.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRxPacketFateReport.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2033,7 +2033,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugTxPacketFate) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugTxPacketFate.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugTxPacketFate.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2052,7 +2052,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugTxPacketFateReport) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugTxPacketFateReport.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugTxPacketFateReport.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2071,7 +2071,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiInformationElement) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiInformationElement.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiInformationElement.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2090,7 +2090,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiRateInfo) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiRateInfo.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiRateInfo.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2109,7 +2109,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiRateNss) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiRateNss.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiRateNss.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2128,7 +2128,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiRatePreamble) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiRatePreamble.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiRatePreamble.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2147,7 +2147,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiStatus) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiStatus.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiStatus.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2166,7 +2166,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiStatusCode) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiStatusCode.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiStatusCode.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2185,7 +2185,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build IWifi.hal # -GEN := $(intermediates)/android/hardware/wifi/1.0/IWifi.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifi.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifi.hal @@ -2210,7 +2210,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build IWifiApIface.hal # -GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiApIface.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiApIface.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiApIface.hal @@ -2231,7 +2231,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build IWifiChip.hal # -GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiChip.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiChip.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiChip.hal @@ -2266,7 +2266,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build IWifiChipEventCallback.hal # -GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiChipEventCallback.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiChipEventCallback.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiChipEventCallback.hal @@ -2287,7 +2287,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build IWifiEventCallback.hal # -GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiEventCallback.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiEventCallback.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiEventCallback.hal @@ -2308,7 +2308,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build IWifiIface.hal # -GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiIface.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiIface.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiIface.hal @@ -2329,7 +2329,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build IWifiNanIface.hal # -GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiNanIface.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiNanIface.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiNanIface.hal @@ -2354,7 +2354,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build IWifiNanIfaceEventCallback.hal # -GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiNanIfaceEventCallback.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiNanIfaceEventCallback.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiNanIfaceEventCallback.hal @@ -2375,7 +2375,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build IWifiP2pIface.hal # -GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiP2pIface.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiP2pIface.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiP2pIface.hal @@ -2396,7 +2396,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build IWifiRttController.hal # -GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiRttController.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiRttController.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiRttController.hal @@ -2421,7 +2421,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build IWifiRttControllerEventCallback.hal # -GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiRttControllerEventCallback.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiRttControllerEventCallback.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiRttControllerEventCallback.hal @@ -2442,7 +2442,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build IWifiStaIface.hal # -GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiStaIface.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiStaIface.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiStaIface.hal @@ -2467,7 +2467,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build IWifiStaIfaceEventCallback.hal # -GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiStaIfaceEventCallback.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiStaIfaceEventCallback.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiStaIfaceEventCallback.hal @@ -2504,7 +2504,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ # # Build types.hal (IfaceType) # -GEN := $(intermediates)/android/hardware/wifi/1.0/IfaceType.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/IfaceType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2523,7 +2523,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanAvailDuration) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanAvailDuration.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanAvailDuration.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2542,7 +2542,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanBeaconSdfPayloadInd) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanBeaconSdfPayloadInd.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanBeaconSdfPayloadInd.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2561,7 +2561,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanBeaconSdfPayloadReceive) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanBeaconSdfPayloadReceive.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanBeaconSdfPayloadReceive.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2580,7 +2580,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanBeaconSdfPayloadRequest) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanBeaconSdfPayloadRequest.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanBeaconSdfPayloadRequest.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2599,7 +2599,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanCapabilitiesResponse) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanCapabilitiesResponse.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanCapabilitiesResponse.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2618,7 +2618,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanCapabilitiesResponseMsg) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanCapabilitiesResponseMsg.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanCapabilitiesResponseMsg.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2637,7 +2637,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanChannelIndex) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanChannelIndex.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanChannelIndex.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2656,7 +2656,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanConfigRequest) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanConfigRequest.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanConfigRequest.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2675,7 +2675,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanConnectionType) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanConnectionType.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanConnectionType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2694,7 +2694,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanDataPathAppInfo) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathAppInfo.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathAppInfo.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2713,7 +2713,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanDataPathCfg) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathCfg.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathCfg.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2732,7 +2732,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanDataPathChannelCfg) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathChannelCfg.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathChannelCfg.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2751,7 +2751,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanDataPathConfirmInd) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathConfirmInd.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathConfirmInd.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2770,7 +2770,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanDataPathEndInd) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathEndInd.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathEndInd.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2789,7 +2789,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanDataPathEndRequest) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathEndRequest.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathEndRequest.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2808,7 +2808,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanDataPathIndicationResponse) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathIndicationResponse.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathIndicationResponse.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2827,7 +2827,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanDataPathInitiatorRequest) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathInitiatorRequest.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathInitiatorRequest.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2846,7 +2846,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanDataPathRequestInd) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathRequestInd.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathRequestInd.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2865,7 +2865,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanDataPathResponse) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathResponse.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathResponse.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2884,7 +2884,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanDataPathResponseCode) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathResponseCode.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathResponseCode.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2903,7 +2903,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanDataPathResponseMsg) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanDataPathResponseMsg.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDataPathResponseMsg.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2922,7 +2922,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanDeviceRole) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanDeviceRole.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDeviceRole.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2941,7 +2941,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanDisabledInd) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanDisabledInd.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDisabledInd.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2960,7 +2960,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanDiscEngEventInd) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanDiscEngEventInd.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDiscEngEventInd.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2979,7 +2979,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanDiscEngEventType) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanDiscEngEventType.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanDiscEngEventType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -2998,7 +2998,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanEnableRequest) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanEnableRequest.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanEnableRequest.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3017,7 +3017,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanFollowupInd) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanFollowupInd.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanFollowupInd.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3036,7 +3036,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanFurtherAvailabilityChannel) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanFurtherAvailabilityChannel.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanFurtherAvailabilityChannel.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3055,7 +3055,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanMatchAlg) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanMatchAlg.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanMatchAlg.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3074,7 +3074,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanMatchExpiredInd) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanMatchExpiredInd.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanMatchExpiredInd.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3093,7 +3093,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanMatchInd) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanMatchInd.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanMatchInd.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3112,7 +3112,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanMaxSize) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanMaxSize.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanMaxSize.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3131,7 +3131,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanPublishCancelRequest) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanPublishCancelRequest.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanPublishCancelRequest.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3150,7 +3150,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanPublishRequest) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanPublishRequest.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanPublishRequest.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3169,7 +3169,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanPublishResponse) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanPublishResponse.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanPublishResponse.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3188,7 +3188,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanPublishResponseMsg) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanPublishResponseMsg.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanPublishResponseMsg.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3207,7 +3207,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanPublishTerminatedInd) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanPublishTerminatedInd.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanPublishTerminatedInd.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3226,7 +3226,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanPublishType) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanPublishType.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanPublishType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3245,7 +3245,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanReceiveVendorSpecificAttribute) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanReceiveVendorSpecificAttribute.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanReceiveVendorSpecificAttribute.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3264,7 +3264,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanResponseMsgHeader) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanResponseMsgHeader.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanResponseMsgHeader.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3283,7 +3283,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanResponseType) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanResponseType.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanResponseType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3302,7 +3302,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanSocialChannelScanParams) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanSocialChannelScanParams.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanSocialChannelScanParams.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3321,7 +3321,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanSrfIncludeType) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanSrfIncludeType.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanSrfIncludeType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3340,7 +3340,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanSrfType) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanSrfType.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanSrfType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3359,7 +3359,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanStatusType) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanStatusType.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanStatusType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3378,7 +3378,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanSubscribeCancelRequest) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanSubscribeCancelRequest.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanSubscribeCancelRequest.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3397,7 +3397,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanSubscribeRequest) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanSubscribeRequest.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanSubscribeRequest.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3416,7 +3416,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanSubscribeResponse) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanSubscribeResponse.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanSubscribeResponse.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3435,7 +3435,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanSubscribeResponseMsg) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanSubscribeResponseMsg.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanSubscribeResponseMsg.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3454,7 +3454,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanSubscribeTerminatedInd) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanSubscribeTerminatedInd.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanSubscribeTerminatedInd.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3473,7 +3473,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanSubscribeType) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanSubscribeType.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanSubscribeType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3492,7 +3492,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanTransmitFollowupInd) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanTransmitFollowupInd.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanTransmitFollowupInd.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3511,7 +3511,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanTransmitFollowupRequest) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanTransmitFollowupRequest.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanTransmitFollowupRequest.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3530,7 +3530,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanTransmitVendorSpecificAttribute) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanTransmitVendorSpecificAttribute.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanTransmitVendorSpecificAttribute.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3549,7 +3549,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanTransmitWindowType) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanTransmitWindowType.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanTransmitWindowType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3568,7 +3568,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanTxPriority) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanTxPriority.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanTxPriority.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3587,7 +3587,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanTxType) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanTxType.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanTxType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3606,7 +3606,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NanVsaRxFrameMask) # -GEN := $(intermediates)/android/hardware/wifi/1.0/NanVsaRxFrameMask.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/NanVsaRxFrameMask.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3625,7 +3625,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RttBw) # -GEN := $(intermediates)/android/hardware/wifi/1.0/RttBw.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/RttBw.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3644,7 +3644,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RttCapabilities) # -GEN := $(intermediates)/android/hardware/wifi/1.0/RttCapabilities.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/RttCapabilities.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3663,7 +3663,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RttConfig) # -GEN := $(intermediates)/android/hardware/wifi/1.0/RttConfig.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/RttConfig.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3682,7 +3682,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RttLciInformation) # -GEN := $(intermediates)/android/hardware/wifi/1.0/RttLciInformation.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/RttLciInformation.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3701,7 +3701,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RttLcrInformation) # -GEN := $(intermediates)/android/hardware/wifi/1.0/RttLcrInformation.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/RttLcrInformation.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3720,7 +3720,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RttMotionPattern) # -GEN := $(intermediates)/android/hardware/wifi/1.0/RttMotionPattern.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/RttMotionPattern.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3739,7 +3739,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RttPeerType) # -GEN := $(intermediates)/android/hardware/wifi/1.0/RttPeerType.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/RttPeerType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3758,7 +3758,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RttPreamble) # -GEN := $(intermediates)/android/hardware/wifi/1.0/RttPreamble.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/RttPreamble.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3777,7 +3777,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RttResponder) # -GEN := $(intermediates)/android/hardware/wifi/1.0/RttResponder.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/RttResponder.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3796,7 +3796,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RttResult) # -GEN := $(intermediates)/android/hardware/wifi/1.0/RttResult.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/RttResult.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3815,7 +3815,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RttStatus) # -GEN := $(intermediates)/android/hardware/wifi/1.0/RttStatus.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/RttStatus.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3834,7 +3834,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (RttType) # -GEN := $(intermediates)/android/hardware/wifi/1.0/RttType.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/RttType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3853,7 +3853,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (StaApfPacketFilterCapabilities) # -GEN := $(intermediates)/android/hardware/wifi/1.0/StaApfPacketFilterCapabilities.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/StaApfPacketFilterCapabilities.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3872,7 +3872,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (StaBackgroundScanBand) # -GEN := $(intermediates)/android/hardware/wifi/1.0/StaBackgroundScanBand.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/StaBackgroundScanBand.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3891,7 +3891,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (StaBackgroundScanBucketEventReportSchemeMask) # -GEN := $(intermediates)/android/hardware/wifi/1.0/StaBackgroundScanBucketEventReportSchemeMask.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/StaBackgroundScanBucketEventReportSchemeMask.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3910,7 +3910,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (StaBackgroundScanBucketParameters) # -GEN := $(intermediates)/android/hardware/wifi/1.0/StaBackgroundScanBucketParameters.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/StaBackgroundScanBucketParameters.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3929,7 +3929,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (StaBackgroundScanCapabilities) # -GEN := $(intermediates)/android/hardware/wifi/1.0/StaBackgroundScanCapabilities.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/StaBackgroundScanCapabilities.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3948,7 +3948,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (StaBackgroundScanParameters) # -GEN := $(intermediates)/android/hardware/wifi/1.0/StaBackgroundScanParameters.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/StaBackgroundScanParameters.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3967,7 +3967,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (StaLinkLayerIfacePacketStats) # -GEN := $(intermediates)/android/hardware/wifi/1.0/StaLinkLayerIfacePacketStats.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/StaLinkLayerIfacePacketStats.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -3986,7 +3986,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (StaLinkLayerIfaceStats) # -GEN := $(intermediates)/android/hardware/wifi/1.0/StaLinkLayerIfaceStats.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/StaLinkLayerIfaceStats.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4005,7 +4005,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (StaLinkLayerRadioStats) # -GEN := $(intermediates)/android/hardware/wifi/1.0/StaLinkLayerRadioStats.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/StaLinkLayerRadioStats.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4024,7 +4024,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (StaLinkLayerStats) # -GEN := $(intermediates)/android/hardware/wifi/1.0/StaLinkLayerStats.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/StaLinkLayerStats.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4043,7 +4043,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (StaScanData) # -GEN := $(intermediates)/android/hardware/wifi/1.0/StaScanData.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/StaScanData.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4062,7 +4062,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (StaScanDataFlagMask) # -GEN := $(intermediates)/android/hardware/wifi/1.0/StaScanDataFlagMask.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/StaScanDataFlagMask.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4081,7 +4081,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (StaScanResult) # -GEN := $(intermediates)/android/hardware/wifi/1.0/StaScanResult.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/StaScanResult.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4100,7 +4100,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiChannelInfo) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiChannelInfo.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiChannelInfo.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4119,7 +4119,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiChannelWidthInMhz) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiChannelWidthInMhz.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiChannelWidthInMhz.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4138,7 +4138,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugHostWakeReasonRxIcmpPacketDetails) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugHostWakeReasonRxIcmpPacketDetails.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugHostWakeReasonRxIcmpPacketDetails.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4157,7 +4157,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugHostWakeReasonRxMulticastPacketDetails) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugHostWakeReasonRxMulticastPacketDetails.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugHostWakeReasonRxMulticastPacketDetails.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4176,7 +4176,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugHostWakeReasonRxPacketDetails) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugHostWakeReasonRxPacketDetails.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugHostWakeReasonRxPacketDetails.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4195,7 +4195,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugHostWakeReasonStats) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugHostWakeReasonStats.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugHostWakeReasonStats.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4214,7 +4214,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugPacketFateFrameInfo) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugPacketFateFrameInfo.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugPacketFateFrameInfo.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4233,7 +4233,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugPacketFateFrameType) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugPacketFateFrameType.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugPacketFateFrameType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4252,7 +4252,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugRingBufferFlags) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingBufferFlags.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingBufferFlags.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4271,7 +4271,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugRingBufferStatus) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingBufferStatus.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingBufferStatus.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4290,7 +4290,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugRingBufferVerboseLevel) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingBufferVerboseLevel.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingBufferVerboseLevel.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4309,7 +4309,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugRingEntryConnectivityEvent) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingEntryConnectivityEvent.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingEntryConnectivityEvent.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4328,7 +4328,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugRingEntryEventTlv) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingEntryEventTlv.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingEntryEventTlv.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4347,7 +4347,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugRingEntryEventTlvType) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingEntryEventTlvType.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingEntryEventTlvType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4366,7 +4366,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugRingEntryEventType) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingEntryEventType.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingEntryEventType.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4385,7 +4385,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugRingEntryFlags) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingEntryFlags.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingEntryFlags.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4404,7 +4404,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugRingEntryHeader) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingEntryHeader.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingEntryHeader.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4423,7 +4423,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugRingEntryPowerEvent) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingEntryPowerEvent.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingEntryPowerEvent.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4442,7 +4442,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugRingEntryVendorData) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingEntryVendorData.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingEntryVendorData.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4461,7 +4461,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugRingEntryWakelockEvent) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRingEntryWakelockEvent.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRingEntryWakelockEvent.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4480,7 +4480,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugRxPacketFate) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRxPacketFate.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRxPacketFate.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4499,7 +4499,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugRxPacketFateReport) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugRxPacketFateReport.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugRxPacketFateReport.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4518,7 +4518,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugTxPacketFate) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugTxPacketFate.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugTxPacketFate.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4537,7 +4537,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiDebugTxPacketFateReport) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiDebugTxPacketFateReport.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiDebugTxPacketFateReport.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4556,7 +4556,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiInformationElement) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiInformationElement.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiInformationElement.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4575,7 +4575,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiRateInfo) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiRateInfo.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiRateInfo.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4594,7 +4594,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiRateNss) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiRateNss.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiRateNss.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4613,7 +4613,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiRatePreamble) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiRatePreamble.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiRatePreamble.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4632,7 +4632,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiStatus) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiStatus.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiStatus.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4651,7 +4651,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (WifiStatusCode) # -GEN := $(intermediates)/android/hardware/wifi/1.0/WifiStatusCode.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/WifiStatusCode.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -4670,7 +4670,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build IWifi.hal # -GEN := $(intermediates)/android/hardware/wifi/1.0/IWifi.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifi.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifi.hal @@ -4695,7 +4695,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build IWifiApIface.hal # -GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiApIface.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiApIface.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiApIface.hal @@ -4716,7 +4716,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build IWifiChip.hal # -GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiChip.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiChip.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiChip.hal @@ -4751,7 +4751,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build IWifiChipEventCallback.hal # -GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiChipEventCallback.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiChipEventCallback.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiChipEventCallback.hal @@ -4772,7 +4772,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build IWifiEventCallback.hal # -GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiEventCallback.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiEventCallback.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiEventCallback.hal @@ -4793,7 +4793,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build IWifiIface.hal # -GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiIface.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiIface.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiIface.hal @@ -4814,7 +4814,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build IWifiNanIface.hal # -GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiNanIface.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiNanIface.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiNanIface.hal @@ -4839,7 +4839,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build IWifiNanIfaceEventCallback.hal # -GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiNanIfaceEventCallback.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiNanIfaceEventCallback.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiNanIfaceEventCallback.hal @@ -4860,7 +4860,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build IWifiP2pIface.hal # -GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiP2pIface.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiP2pIface.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiP2pIface.hal @@ -4881,7 +4881,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build IWifiRttController.hal # -GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiRttController.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiRttController.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiRttController.hal @@ -4906,7 +4906,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build IWifiRttControllerEventCallback.hal # -GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiRttControllerEventCallback.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiRttControllerEventCallback.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiRttControllerEventCallback.hal @@ -4927,7 +4927,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build IWifiStaIface.hal # -GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiStaIface.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiStaIface.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiStaIface.hal @@ -4952,7 +4952,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build IWifiStaIfaceEventCallback.hal # -GEN := $(intermediates)/android/hardware/wifi/1.0/IWifiStaIfaceEventCallback.java +GEN := $(intermediates)/android/hardware/wifi/V1_0/IWifiStaIfaceEventCallback.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IWifiStaIfaceEventCallback.hal diff --git a/wifi/supplicant/1.0/Android.mk b/wifi/supplicant/1.0/Android.mk index 41669da812..02a62b65e2 100644 --- a/wifi/supplicant/1.0/Android.mk +++ b/wifi/supplicant/1.0/Android.mk @@ -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