Merge "wifi: Move supplicant HIDL interfaces to subfolder" am: d8a7bb5838
am: bc667d76d7
Change-Id: Ifa456d3a92d832c4e85f144170fca9865d13f603
This commit is contained in:
commit
2fc64b6736
10 changed files with 564 additions and 485 deletions
|
@ -25,126 +25,6 @@ $(GEN): $(LOCAL_PATH)/types.hal
|
|||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build ISupplicant.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/1.0/SupplicantAll.cpp
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicant.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantCallback.hal
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantCallback.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantIface.hal
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantIface.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Lc++ -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi@1.0::ISupplicant
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicant.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build ISupplicantCallback.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/1.0/SupplicantCallbackAll.cpp
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantCallback.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Lc++ -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi@1.0::ISupplicantCallback
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantCallback.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build ISupplicantIface.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/1.0/SupplicantIfaceAll.cpp
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantIface.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantIfaceCallback.hal
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantIfaceCallback.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantNetwork.hal
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantNetwork.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Lc++ -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi@1.0::ISupplicantIface
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantIface.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build ISupplicantIfaceCallback.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/1.0/SupplicantIfaceCallbackAll.cpp
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantIfaceCallback.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Lc++ -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi@1.0::ISupplicantIfaceCallback
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantIfaceCallback.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build ISupplicantNetwork.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/1.0/SupplicantNetworkAll.cpp
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantNetwork.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantNetworkCallback.hal
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantNetworkCallback.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Lc++ -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi@1.0::ISupplicantNetwork
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantNetwork.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build ISupplicantNetworkCallback.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/1.0/SupplicantNetworkCallbackAll.cpp
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantNetworkCallback.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Lc++ -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi@1.0::ISupplicantNetworkCallback
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantNetworkCallback.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build IWifi.hal
|
||||
#
|
||||
|
@ -279,160 +159,6 @@ $(GEN): $(LOCAL_PATH)/types.hal
|
|||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build types.hal (SupplicantStatus)
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/1.0/SupplicantStatus.java
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Ljava -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi@1.0::types.SupplicantStatus
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build types.hal (SupplicantStatusCode)
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/1.0/SupplicantStatusCode.java
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Ljava -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi@1.0::types.SupplicantStatusCode
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build ISupplicant.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/1.0/ISupplicant.java
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicant.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantCallback.hal
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantCallback.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantIface.hal
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantIface.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Ljava -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi@1.0::ISupplicant
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicant.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build ISupplicantCallback.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/1.0/ISupplicantCallback.java
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantCallback.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Ljava -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi@1.0::ISupplicantCallback
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantCallback.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build ISupplicantIface.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/1.0/ISupplicantIface.java
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantIface.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantIfaceCallback.hal
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantIfaceCallback.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantNetwork.hal
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantNetwork.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Ljava -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi@1.0::ISupplicantIface
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantIface.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build ISupplicantIfaceCallback.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/1.0/ISupplicantIfaceCallback.java
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantIfaceCallback.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Ljava -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi@1.0::ISupplicantIfaceCallback
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantIfaceCallback.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build ISupplicantNetwork.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/1.0/ISupplicantNetwork.java
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantNetwork.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantNetworkCallback.hal
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantNetworkCallback.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Ljava -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi@1.0::ISupplicantNetwork
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantNetwork.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build ISupplicantNetworkCallback.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/1.0/ISupplicantNetworkCallback.java
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantNetworkCallback.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Ljava -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi@1.0::ISupplicantNetworkCallback
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantNetworkCallback.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build IWifi.hal
|
||||
#
|
||||
|
@ -559,160 +285,6 @@ $(GEN): $(LOCAL_PATH)/types.hal
|
|||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build types.hal (SupplicantStatus)
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/1.0/SupplicantStatus.java
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Ljava -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi@1.0::types.SupplicantStatus
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build types.hal (SupplicantStatusCode)
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/1.0/SupplicantStatusCode.java
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Ljava -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi@1.0::types.SupplicantStatusCode
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build ISupplicant.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/1.0/ISupplicant.java
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicant.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantCallback.hal
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantCallback.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantIface.hal
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantIface.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Ljava -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi@1.0::ISupplicant
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicant.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build ISupplicantCallback.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/1.0/ISupplicantCallback.java
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantCallback.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Ljava -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi@1.0::ISupplicantCallback
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantCallback.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build ISupplicantIface.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/1.0/ISupplicantIface.java
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantIface.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantIfaceCallback.hal
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantIfaceCallback.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantNetwork.hal
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantNetwork.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Ljava -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi@1.0::ISupplicantIface
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantIface.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build ISupplicantIfaceCallback.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/1.0/ISupplicantIfaceCallback.java
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantIfaceCallback.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Ljava -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi@1.0::ISupplicantIfaceCallback
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantIfaceCallback.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build ISupplicantNetwork.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/1.0/ISupplicantNetwork.java
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantNetwork.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantNetworkCallback.hal
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantNetworkCallback.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Ljava -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi@1.0::ISupplicantNetwork
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantNetwork.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build ISupplicantNetworkCallback.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/1.0/ISupplicantNetworkCallback.java
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantNetworkCallback.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Ljava -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi@1.0::ISupplicantNetworkCallback
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantNetworkCallback.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build IWifi.hal
|
||||
#
|
||||
|
|
|
@ -44,54 +44,3 @@ struct FailureReason {
|
|||
* An identifier for a mode that the chip can be put in.
|
||||
*/
|
||||
typedef uint32_t ChipModeId;
|
||||
|
||||
/**
|
||||
* Enum values indicating the status of any supplicant operation.
|
||||
*/
|
||||
enum SupplicantStatusCode : uint32_t {
|
||||
/** No errors. */
|
||||
SUCCESS,
|
||||
/** Unknown failure occured. */
|
||||
FAILURE_UNKNOWN,
|
||||
/** One of the incoming args is invalid. */
|
||||
FAILURE_ARGS_INVALID,
|
||||
/** |ISupplicantIface| HIDL interface object is no longer valid. */
|
||||
FAILURE_IFACE_INVALID,
|
||||
/** Iface with the provided name does not exist. */
|
||||
FAILURE_IFACE_UNKNOWN,
|
||||
/** Iface with the provided name already exists. */
|
||||
FAILURE_IFACE_EXISTS,
|
||||
/** Iface is disabled and cannot be used. */
|
||||
FAILURE_IFACE_DISABLED,
|
||||
/** Iface is not currently disconnected, so cannot reconnect. */
|
||||
FAILURE_IFACE_NOT_DISCONNECTED,
|
||||
/** |ISupplicantNetwork| HIDL interface object is no longer valid. */
|
||||
FAILURE_NETWORK_INVALID,
|
||||
/** Network with the provided id does not exist. */
|
||||
FAILURE_NETWORK_UNKNOWN
|
||||
};
|
||||
|
||||
/**
|
||||
* Generic structure to return the status of any supplicant operation.
|
||||
*/
|
||||
struct SupplicantStatus {
|
||||
SupplicantStatusCode code;
|
||||
/**
|
||||
* A vendor specific error message to provide more information beyond the
|
||||
* status code.
|
||||
* This will be used for debbuging purposes only.
|
||||
*/
|
||||
string debugMessage;
|
||||
};
|
||||
|
||||
/** SSID type. Max of 32 octets representing service identifier of a network. */
|
||||
typedef vec<uint8_t> Ssid;
|
||||
|
||||
/** MAC Address type. 6 octets representing physical address of a device. */
|
||||
typedef uint8_t[6] MacAddress;
|
||||
|
||||
/** BSSID type. 6 octets representing the physical address of an AP. */
|
||||
typedef MacAddress Bssid;
|
||||
|
||||
/** Supplicant network ID type. */
|
||||
typedef uint32_t SupplicantNetworkId;
|
||||
|
|
491
wifi/supplicant/1.0/Android.mk
Normal file
491
wifi/supplicant/1.0/Android.mk
Normal file
|
@ -0,0 +1,491 @@
|
|||
LOCAL_PATH := $(call my-dir)
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
LOCAL_MODULE := android.hardware.wifi.supplicant@1.0
|
||||
LOCAL_MODULE_CLASS := SHARED_LIBRARIES
|
||||
|
||||
intermediates := $(local-generated-sources-dir)
|
||||
|
||||
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
|
||||
|
||||
#
|
||||
# Build types.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/types.cpp
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Lc++ -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi.supplicant@1.0::types
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build ISupplicant.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/SupplicantAll.cpp
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicant.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantCallback.hal
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantCallback.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantIface.hal
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantIface.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Lc++ -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi.supplicant@1.0::ISupplicant
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicant.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build ISupplicantCallback.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/SupplicantCallbackAll.cpp
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantCallback.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Lc++ -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi.supplicant@1.0::ISupplicantCallback
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantCallback.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build ISupplicantIface.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/SupplicantIfaceAll.cpp
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantIface.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantIfaceCallback.hal
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantIfaceCallback.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantNetwork.hal
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantNetwork.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Lc++ -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi.supplicant@1.0::ISupplicantIface
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantIface.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build ISupplicantIfaceCallback.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/SupplicantIfaceCallbackAll.cpp
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantIfaceCallback.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Lc++ -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi.supplicant@1.0::ISupplicantIfaceCallback
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantIfaceCallback.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build ISupplicantNetwork.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/SupplicantNetworkAll.cpp
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantNetwork.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantNetworkCallback.hal
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantNetworkCallback.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Lc++ -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi.supplicant@1.0::ISupplicantNetwork
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantNetwork.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build ISupplicantNetworkCallback.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/SupplicantNetworkCallbackAll.cpp
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantNetworkCallback.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Lc++ -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi.supplicant@1.0::ISupplicantNetworkCallback
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantNetworkCallback.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)
|
||||
LOCAL_SHARED_LIBRARIES := \
|
||||
libhidl \
|
||||
libhwbinder \
|
||||
libutils \
|
||||
libcutils \
|
||||
|
||||
LOCAL_MULTILIB := both
|
||||
include $(BUILD_SHARED_LIBRARY)
|
||||
|
||||
################################################################################
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_MODULE := android.hardware.wifi.supplicant@1.0-java
|
||||
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
|
||||
|
||||
intermediates := $(local-generated-sources-dir)
|
||||
|
||||
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
|
||||
|
||||
#
|
||||
# Build types.hal (SupplicantStatus)
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/SupplicantStatus.java
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Ljava -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi.supplicant@1.0::types.SupplicantStatus
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build types.hal (SupplicantStatusCode)
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/SupplicantStatusCode.java
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Ljava -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi.supplicant@1.0::types.SupplicantStatusCode
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build ISupplicant.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicant.java
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicant.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantCallback.hal
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantCallback.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantIface.hal
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantIface.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Ljava -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi.supplicant@1.0::ISupplicant
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicant.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build ISupplicantCallback.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantCallback.java
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantCallback.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Ljava -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi.supplicant@1.0::ISupplicantCallback
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantCallback.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build ISupplicantIface.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantIface.java
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantIface.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantIfaceCallback.hal
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantIfaceCallback.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantNetwork.hal
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantNetwork.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Ljava -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi.supplicant@1.0::ISupplicantIface
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantIface.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build ISupplicantIfaceCallback.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantIfaceCallback.java
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantIfaceCallback.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Ljava -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi.supplicant@1.0::ISupplicantIfaceCallback
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantIfaceCallback.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build ISupplicantNetwork.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantNetwork.java
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantNetwork.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantNetworkCallback.hal
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantNetworkCallback.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Ljava -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi.supplicant@1.0::ISupplicantNetwork
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantNetwork.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build ISupplicantNetworkCallback.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantNetworkCallback.java
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantNetworkCallback.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Ljava -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi.supplicant@1.0::ISupplicantNetworkCallback
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantNetworkCallback.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
include $(BUILD_JAVA_LIBRARY)
|
||||
|
||||
|
||||
################################################################################
|
||||
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_MODULE := android.hardware.wifi.supplicant@1.0-java-static
|
||||
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
|
||||
|
||||
intermediates := $(local-generated-sources-dir)
|
||||
|
||||
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
|
||||
|
||||
#
|
||||
# Build types.hal (SupplicantStatus)
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/SupplicantStatus.java
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Ljava -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi.supplicant@1.0::types.SupplicantStatus
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build types.hal (SupplicantStatusCode)
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/SupplicantStatusCode.java
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Ljava -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi.supplicant@1.0::types.SupplicantStatusCode
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build ISupplicant.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicant.java
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicant.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantCallback.hal
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantCallback.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantIface.hal
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantIface.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Ljava -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi.supplicant@1.0::ISupplicant
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicant.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build ISupplicantCallback.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantCallback.java
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantCallback.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Ljava -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi.supplicant@1.0::ISupplicantCallback
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantCallback.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build ISupplicantIface.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantIface.java
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantIface.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantIfaceCallback.hal
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantIfaceCallback.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantNetwork.hal
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantNetwork.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Ljava -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi.supplicant@1.0::ISupplicantIface
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantIface.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build ISupplicantIfaceCallback.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantIfaceCallback.java
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantIfaceCallback.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Ljava -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi.supplicant@1.0::ISupplicantIfaceCallback
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantIfaceCallback.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build ISupplicantNetwork.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantNetwork.java
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantNetwork.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantNetworkCallback.hal
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantNetworkCallback.hal
|
||||
$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
|
||||
$(GEN): $(LOCAL_PATH)/types.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Ljava -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi.supplicant@1.0::ISupplicantNetwork
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantNetwork.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
|
||||
#
|
||||
# Build ISupplicantNetworkCallback.hal
|
||||
#
|
||||
GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantNetworkCallback.java
|
||||
$(GEN): $(HIDL)
|
||||
$(GEN): PRIVATE_HIDL := $(HIDL)
|
||||
$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantNetworkCallback.hal
|
||||
$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
|
||||
$(GEN): PRIVATE_CUSTOM_TOOL = \
|
||||
$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
|
||||
-Ljava -randroid.hardware:hardware/interfaces \
|
||||
android.hardware.wifi.supplicant@1.0::ISupplicantNetworkCallback
|
||||
|
||||
$(GEN): $(LOCAL_PATH)/ISupplicantNetworkCallback.hal
|
||||
$(transform-generated-source)
|
||||
LOCAL_GENERATED_SOURCES += $(GEN)
|
||||
include $(BUILD_STATIC_JAVA_LIBRARY)
|
||||
|
||||
|
||||
|
||||
include $(call all-makefiles-under,$(LOCAL_PATH))
|
|
@ -14,7 +14,7 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package android.hardware.wifi@1.0;
|
||||
package android.hardware.wifi.supplicant@1.0;
|
||||
|
||||
import ISupplicantCallback;
|
||||
import ISupplicantIface;
|
|
@ -14,7 +14,7 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package android.hardware.wifi@1.0;
|
||||
package android.hardware.wifi.supplicant@1.0;
|
||||
|
||||
/**
|
||||
* Callback Interface exposed by the wpa_supplicant service (ISupplicant).
|
|
@ -14,7 +14,7 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package android.hardware.wifi@1.0;
|
||||
package android.hardware.wifi.supplicant@1.0;
|
||||
|
||||
import ISupplicantIfaceCallback;
|
||||
import ISupplicantNetwork;
|
|
@ -14,7 +14,7 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package android.hardware.wifi@1.0;
|
||||
package android.hardware.wifi.supplicant@1.0;
|
||||
|
||||
/**
|
||||
* Callback Interface exposed by the wpa_supplicant service
|
|
@ -14,7 +14,7 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package android.hardware.wifi@1.0;
|
||||
package android.hardware.wifi.supplicant@1.0;
|
||||
|
||||
import ISupplicantNetworkCallback;
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package android.hardware.wifi@1.0;
|
||||
package android.hardware.wifi.supplicant@1.0;
|
||||
|
||||
/**
|
||||
* Callback Interface exposed by the wpa_supplicant service
|
67
wifi/supplicant/1.0/types.hal
Normal file
67
wifi/supplicant/1.0/types.hal
Normal file
|
@ -0,0 +1,67 @@
|
|||
/*
|
||||
* Copyright 2016 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package android.hardware.wifi.supplicant@1.0;
|
||||
/**
|
||||
* Enum values indicating the status of any supplicant operation.
|
||||
*/
|
||||
enum SupplicantStatusCode : uint32_t {
|
||||
/** No errors. */
|
||||
SUCCESS,
|
||||
/** Unknown failure occured. */
|
||||
FAILURE_UNKNOWN,
|
||||
/** One of the incoming args is invalid. */
|
||||
FAILURE_ARGS_INVALID,
|
||||
/** |ISupplicantIface| HIDL interface object is no longer valid. */
|
||||
FAILURE_IFACE_INVALID,
|
||||
/** Iface with the provided name does not exist. */
|
||||
FAILURE_IFACE_UNKNOWN,
|
||||
/** Iface with the provided name already exists. */
|
||||
FAILURE_IFACE_EXISTS,
|
||||
/** Iface is disabled and cannot be used. */
|
||||
FAILURE_IFACE_DISABLED,
|
||||
/** Iface is not currently disconnected, so cannot reconnect. */
|
||||
FAILURE_IFACE_NOT_DISCONNECTED,
|
||||
/** |ISupplicantNetwork| HIDL interface object is no longer valid. */
|
||||
FAILURE_NETWORK_INVALID,
|
||||
/** Network with the provided id does not exist. */
|
||||
FAILURE_NETWORK_UNKNOWN
|
||||
};
|
||||
|
||||
/**
|
||||
* Generic structure to return the status of any supplicant operation.
|
||||
*/
|
||||
struct SupplicantStatus {
|
||||
SupplicantStatusCode code;
|
||||
/**
|
||||
* A vendor specific error message to provide more information beyond the
|
||||
* status code.
|
||||
* This will be used for debbuging purposes only.
|
||||
*/
|
||||
string debugMessage;
|
||||
};
|
||||
|
||||
/** SSID type. Max of 32 octets representing service identifier of a network. */
|
||||
typedef vec<uint8_t> Ssid;
|
||||
|
||||
/** MAC Address type. 6 octets representing physical address of a device. */
|
||||
typedef uint8_t[6] MacAddress;
|
||||
|
||||
/** BSSID type. 6 octets representing the physical address of an AP. */
|
||||
typedef MacAddress Bssid;
|
||||
|
||||
/** Supplicant network ID type. */
|
||||
typedef uint32_t SupplicantNetworkId;
|
Loading…
Reference in a new issue