Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39f588f8 authored by Roshan Pius's avatar Roshan Pius
Browse files

wpa_supplicant(interface): Add iface/network type 

Add separate types of Iface/Network object for STA (station mode) and
P2P mode ifaces and associated networks. These expose very different
functionality and exposing 2 different types of objects makes the
interface cleaner.
Although, they're still represented via the same struct for both types
in the wpa_supplicant core.

Bug: 32553421
Test: ./hardware/interfaces/update-makefiles.sh
Change-Id: I41601a650709429c65014cb7adaf6cb9ab03787e
parent 8766c010

wifi/supplicant/1.0/Android.bp

+64 −16
Original line number Diff line number Diff line
@@ -9,18 +9,30 @@ genrule { 
        "ISupplicant.hal",

        "ISupplicantCallback.hal",

        "ISupplicantIface.hal",

        "ISupplicantIfaceCallback.hal",

        "ISupplicantNetwork.hal",

        "ISupplicantNetworkCallback.hal",

        "ISupplicantP2pIface.hal",

        "ISupplicantP2pIfaceCallback.hal",

        "ISupplicantP2pNetwork.hal",

        "ISupplicantP2pNetworkCallback.hal",

        "ISupplicantStaIface.hal",

        "ISupplicantStaIfaceCallback.hal",

        "ISupplicantStaNetwork.hal",

        "ISupplicantStaNetworkCallback.hal",

    ],

    out: [

        "android/hardware/wifi/supplicant/1.0/types.cpp",

        "android/hardware/wifi/supplicant/1.0/SupplicantAll.cpp",

        "android/hardware/wifi/supplicant/1.0/SupplicantCallbackAll.cpp",

        "android/hardware/wifi/supplicant/1.0/SupplicantIfaceAll.cpp",

        "android/hardware/wifi/supplicant/1.0/SupplicantIfaceCallbackAll.cpp",

        "android/hardware/wifi/supplicant/1.0/SupplicantNetworkAll.cpp",

        "android/hardware/wifi/supplicant/1.0/SupplicantNetworkCallbackAll.cpp",

        "android/hardware/wifi/supplicant/1.0/SupplicantP2pIfaceAll.cpp",

        "android/hardware/wifi/supplicant/1.0/SupplicantP2pIfaceCallbackAll.cpp",

        "android/hardware/wifi/supplicant/1.0/SupplicantP2pNetworkAll.cpp",

        "android/hardware/wifi/supplicant/1.0/SupplicantP2pNetworkCallbackAll.cpp",

        "android/hardware/wifi/supplicant/1.0/SupplicantStaIfaceAll.cpp",

        "android/hardware/wifi/supplicant/1.0/SupplicantStaIfaceCallbackAll.cpp",

        "android/hardware/wifi/supplicant/1.0/SupplicantStaNetworkAll.cpp",

        "android/hardware/wifi/supplicant/1.0/SupplicantStaNetworkCallbackAll.cpp",

    ],

}
@@ -33,9 +45,15 @@ genrule { 
        "ISupplicant.hal",

        "ISupplicantCallback.hal",

        "ISupplicantIface.hal",

        "ISupplicantIfaceCallback.hal",

        "ISupplicantNetwork.hal",

        "ISupplicantNetworkCallback.hal",

        "ISupplicantP2pIface.hal",

        "ISupplicantP2pIfaceCallback.hal",

        "ISupplicantP2pNetwork.hal",

        "ISupplicantP2pNetworkCallback.hal",

        "ISupplicantStaIface.hal",

        "ISupplicantStaIfaceCallback.hal",

        "ISupplicantStaNetwork.hal",

        "ISupplicantStaNetworkCallback.hal",

    ],

    out: [

        "android/hardware/wifi/supplicant/1.0/types.h",
@@ -54,21 +72,51 @@ genrule { 
        "android/hardware/wifi/supplicant/1.0/BnSupplicantIface.h",

        "android/hardware/wifi/supplicant/1.0/BpSupplicantIface.h",

        "android/hardware/wifi/supplicant/1.0/BsSupplicantIface.h",

        "android/hardware/wifi/supplicant/1.0/ISupplicantIfaceCallback.h",

        "android/hardware/wifi/supplicant/1.0/IHwSupplicantIfaceCallback.h",

        "android/hardware/wifi/supplicant/1.0/BnSupplicantIfaceCallback.h",

        "android/hardware/wifi/supplicant/1.0/BpSupplicantIfaceCallback.h",

        "android/hardware/wifi/supplicant/1.0/BsSupplicantIfaceCallback.h",

        "android/hardware/wifi/supplicant/1.0/ISupplicantNetwork.h",

        "android/hardware/wifi/supplicant/1.0/IHwSupplicantNetwork.h",

        "android/hardware/wifi/supplicant/1.0/BnSupplicantNetwork.h",

        "android/hardware/wifi/supplicant/1.0/BpSupplicantNetwork.h",

        "android/hardware/wifi/supplicant/1.0/BsSupplicantNetwork.h",

        "android/hardware/wifi/supplicant/1.0/ISupplicantNetworkCallback.h",

        "android/hardware/wifi/supplicant/1.0/IHwSupplicantNetworkCallback.h",

        "android/hardware/wifi/supplicant/1.0/BnSupplicantNetworkCallback.h",

        "android/hardware/wifi/supplicant/1.0/BpSupplicantNetworkCallback.h",

        "android/hardware/wifi/supplicant/1.0/BsSupplicantNetworkCallback.h",

        "android/hardware/wifi/supplicant/1.0/ISupplicantP2pIface.h",

        "android/hardware/wifi/supplicant/1.0/IHwSupplicantP2pIface.h",

        "android/hardware/wifi/supplicant/1.0/BnSupplicantP2pIface.h",

        "android/hardware/wifi/supplicant/1.0/BpSupplicantP2pIface.h",

        "android/hardware/wifi/supplicant/1.0/BsSupplicantP2pIface.h",

        "android/hardware/wifi/supplicant/1.0/ISupplicantP2pIfaceCallback.h",

        "android/hardware/wifi/supplicant/1.0/IHwSupplicantP2pIfaceCallback.h",

        "android/hardware/wifi/supplicant/1.0/BnSupplicantP2pIfaceCallback.h",

        "android/hardware/wifi/supplicant/1.0/BpSupplicantP2pIfaceCallback.h",

        "android/hardware/wifi/supplicant/1.0/BsSupplicantP2pIfaceCallback.h",

        "android/hardware/wifi/supplicant/1.0/ISupplicantP2pNetwork.h",

        "android/hardware/wifi/supplicant/1.0/IHwSupplicantP2pNetwork.h",

        "android/hardware/wifi/supplicant/1.0/BnSupplicantP2pNetwork.h",

        "android/hardware/wifi/supplicant/1.0/BpSupplicantP2pNetwork.h",

        "android/hardware/wifi/supplicant/1.0/BsSupplicantP2pNetwork.h",

        "android/hardware/wifi/supplicant/1.0/ISupplicantP2pNetworkCallback.h",

        "android/hardware/wifi/supplicant/1.0/IHwSupplicantP2pNetworkCallback.h",

        "android/hardware/wifi/supplicant/1.0/BnSupplicantP2pNetworkCallback.h",

        "android/hardware/wifi/supplicant/1.0/BpSupplicantP2pNetworkCallback.h",

        "android/hardware/wifi/supplicant/1.0/BsSupplicantP2pNetworkCallback.h",

        "android/hardware/wifi/supplicant/1.0/ISupplicantStaIface.h",

        "android/hardware/wifi/supplicant/1.0/IHwSupplicantStaIface.h",

        "android/hardware/wifi/supplicant/1.0/BnSupplicantStaIface.h",

        "android/hardware/wifi/supplicant/1.0/BpSupplicantStaIface.h",

        "android/hardware/wifi/supplicant/1.0/BsSupplicantStaIface.h",

        "android/hardware/wifi/supplicant/1.0/ISupplicantStaIfaceCallback.h",

        "android/hardware/wifi/supplicant/1.0/IHwSupplicantStaIfaceCallback.h",

        "android/hardware/wifi/supplicant/1.0/BnSupplicantStaIfaceCallback.h",

        "android/hardware/wifi/supplicant/1.0/BpSupplicantStaIfaceCallback.h",

        "android/hardware/wifi/supplicant/1.0/BsSupplicantStaIfaceCallback.h",

        "android/hardware/wifi/supplicant/1.0/ISupplicantStaNetwork.h",

        "android/hardware/wifi/supplicant/1.0/IHwSupplicantStaNetwork.h",

        "android/hardware/wifi/supplicant/1.0/BnSupplicantStaNetwork.h",

        "android/hardware/wifi/supplicant/1.0/BpSupplicantStaNetwork.h",

        "android/hardware/wifi/supplicant/1.0/BsSupplicantStaNetwork.h",

        "android/hardware/wifi/supplicant/1.0/ISupplicantStaNetworkCallback.h",

        "android/hardware/wifi/supplicant/1.0/IHwSupplicantStaNetworkCallback.h",

        "android/hardware/wifi/supplicant/1.0/BnSupplicantStaNetworkCallback.h",

        "android/hardware/wifi/supplicant/1.0/BpSupplicantStaNetworkCallback.h",

        "android/hardware/wifi/supplicant/1.0/BsSupplicantStaNetworkCallback.h",

    ],

}

wifi/supplicant/1.0/Android.mk

+318 −36
Original line number Diff line number Diff line
@@ -12,6 +12,23 @@ intermediates := $(local-generated-sources-dir) 


HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)



#

# Build types.hal (IfaceType)

#

GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/IfaceType.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.IfaceType



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (SupplicantStatus)

#
@@ -93,8 +110,6 @@ GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantIface.ja 
$(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
@@ -110,59 +125,185 @@ $(GEN): $(LOCAL_PATH)/ISupplicantIface.hal 
LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ISupplicantIfaceCallback.hal

# Build ISupplicantNetwork.hal

#

GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantIfaceCallback.java

GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantNetwork.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantIfaceCallback.hal

$(GEN): PRIVATE_DEPS := $(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::ISupplicantIfaceCallback

        android.hardware.wifi.supplicant@1.0::ISupplicantNetwork



$(GEN): $(LOCAL_PATH)/ISupplicantIfaceCallback.hal

$(GEN): $(LOCAL_PATH)/ISupplicantNetwork.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ISupplicantNetwork.hal

# Build ISupplicantP2pIface.hal

#

GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantNetwork.java

GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantP2pIface.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)/ISupplicantP2pIface.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantIface.hal

$(GEN): $(LOCAL_PATH)/ISupplicantIface.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantP2pIfaceCallback.hal

$(GEN): $(LOCAL_PATH)/ISupplicantP2pIfaceCallback.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

        android.hardware.wifi.supplicant@1.0::ISupplicantP2pIface



$(GEN): $(LOCAL_PATH)/ISupplicantP2pIface.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ISupplicantP2pIfaceCallback.hal

#

GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantP2pIfaceCallback.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantP2pIfaceCallback.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::ISupplicantP2pIfaceCallback



$(GEN): $(LOCAL_PATH)/ISupplicantP2pIfaceCallback.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ISupplicantP2pNetwork.hal

#

GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantP2pNetwork.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantP2pNetwork.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantNetwork.hal

$(GEN): $(LOCAL_PATH)/ISupplicantNetwork.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantP2pNetworkCallback.hal

$(GEN): $(LOCAL_PATH)/ISupplicantP2pNetworkCallback.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::ISupplicantP2pNetwork



$(GEN): $(LOCAL_PATH)/ISupplicantP2pNetwork.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ISupplicantP2pNetworkCallback.hal

#

GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantP2pNetworkCallback.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantP2pNetworkCallback.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::ISupplicantP2pNetworkCallback



$(GEN): $(LOCAL_PATH)/ISupplicantP2pNetworkCallback.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ISupplicantStaIface.hal

#

GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantStaIface.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantStaIface.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantIface.hal

$(GEN): $(LOCAL_PATH)/ISupplicantIface.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantStaIfaceCallback.hal

$(GEN): $(LOCAL_PATH)/ISupplicantStaIfaceCallback.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::ISupplicantStaIface



$(GEN): $(LOCAL_PATH)/ISupplicantStaIface.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ISupplicantStaIfaceCallback.hal

#

GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantStaIfaceCallback.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantStaIfaceCallback.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::ISupplicantStaIfaceCallback



$(GEN): $(LOCAL_PATH)/ISupplicantStaIfaceCallback.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ISupplicantStaNetwork.hal

#

GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantStaNetwork.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantStaNetwork.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantNetwork.hal

$(GEN): $(LOCAL_PATH)/ISupplicantNetwork.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantStaNetworkCallback.hal

$(GEN): $(LOCAL_PATH)/ISupplicantStaNetworkCallback.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::ISupplicantStaNetwork



$(GEN): $(LOCAL_PATH)/ISupplicantStaNetwork.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ISupplicantNetworkCallback.hal

# Build ISupplicantStaNetworkCallback.hal

#

GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantNetworkCallback.java

GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantStaNetworkCallback.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantNetworkCallback.hal

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantStaNetworkCallback.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

        android.hardware.wifi.supplicant@1.0::ISupplicantStaNetworkCallback



$(GEN): $(LOCAL_PATH)/ISupplicantNetworkCallback.hal

$(GEN): $(LOCAL_PATH)/ISupplicantStaNetworkCallback.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)

include $(BUILD_JAVA_LIBRARY)
@@ -178,6 +319,23 @@ intermediates := $(local-generated-sources-dir) 


HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)



#

# Build types.hal (IfaceType)

#

GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/IfaceType.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.IfaceType



$(GEN): $(LOCAL_PATH)/types.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build types.hal (SupplicantStatus)

#
@@ -259,8 +417,6 @@ GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantIface.ja 
$(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
@@ -276,59 +432,185 @@ $(GEN): $(LOCAL_PATH)/ISupplicantIface.hal 
LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ISupplicantIfaceCallback.hal

# Build ISupplicantNetwork.hal

#

GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantIfaceCallback.java

GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantNetwork.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantIfaceCallback.hal

$(GEN): PRIVATE_DEPS := $(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::ISupplicantIfaceCallback

        android.hardware.wifi.supplicant@1.0::ISupplicantNetwork



$(GEN): $(LOCAL_PATH)/ISupplicantIfaceCallback.hal

$(GEN): $(LOCAL_PATH)/ISupplicantNetwork.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ISupplicantNetwork.hal

# Build ISupplicantP2pIface.hal

#

GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantNetwork.java

GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantP2pIface.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)/ISupplicantP2pIface.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantIface.hal

$(GEN): $(LOCAL_PATH)/ISupplicantIface.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantP2pIfaceCallback.hal

$(GEN): $(LOCAL_PATH)/ISupplicantP2pIfaceCallback.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

        android.hardware.wifi.supplicant@1.0::ISupplicantP2pIface



$(GEN): $(LOCAL_PATH)/ISupplicantP2pIface.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ISupplicantP2pIfaceCallback.hal

#

GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantP2pIfaceCallback.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantP2pIfaceCallback.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::ISupplicantP2pIfaceCallback



$(GEN): $(LOCAL_PATH)/ISupplicantP2pIfaceCallback.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ISupplicantP2pNetwork.hal

#

GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantP2pNetwork.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantP2pNetwork.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantNetwork.hal

$(GEN): $(LOCAL_PATH)/ISupplicantNetwork.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantP2pNetworkCallback.hal

$(GEN): $(LOCAL_PATH)/ISupplicantP2pNetworkCallback.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::ISupplicantP2pNetwork



$(GEN): $(LOCAL_PATH)/ISupplicantP2pNetwork.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ISupplicantP2pNetworkCallback.hal

#

GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantP2pNetworkCallback.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantP2pNetworkCallback.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::ISupplicantP2pNetworkCallback



$(GEN): $(LOCAL_PATH)/ISupplicantP2pNetworkCallback.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ISupplicantStaIface.hal

#

GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantStaIface.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantStaIface.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantIface.hal

$(GEN): $(LOCAL_PATH)/ISupplicantIface.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantStaIfaceCallback.hal

$(GEN): $(LOCAL_PATH)/ISupplicantStaIfaceCallback.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::ISupplicantStaIface



$(GEN): $(LOCAL_PATH)/ISupplicantStaIface.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ISupplicantStaIfaceCallback.hal

#

GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantStaIfaceCallback.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantStaIfaceCallback.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::ISupplicantStaIfaceCallback



$(GEN): $(LOCAL_PATH)/ISupplicantStaIfaceCallback.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ISupplicantStaNetwork.hal

#

GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantStaNetwork.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantStaNetwork.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantNetwork.hal

$(GEN): $(LOCAL_PATH)/ISupplicantNetwork.hal

$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/ISupplicantStaNetworkCallback.hal

$(GEN): $(LOCAL_PATH)/ISupplicantStaNetworkCallback.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::ISupplicantStaNetwork



$(GEN): $(LOCAL_PATH)/ISupplicantStaNetwork.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)



#

# Build ISupplicantNetworkCallback.hal

# Build ISupplicantStaNetworkCallback.hal

#

GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantNetworkCallback.java

GEN := $(intermediates)/android/hardware/wifi/supplicant/1.0/ISupplicantStaNetworkCallback.java

$(GEN): $(HIDL)

$(GEN): PRIVATE_HIDL := $(HIDL)

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantNetworkCallback.hal

$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/ISupplicantStaNetworkCallback.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

        android.hardware.wifi.supplicant@1.0::ISupplicantStaNetworkCallback



$(GEN): $(LOCAL_PATH)/ISupplicantNetworkCallback.hal

$(GEN): $(LOCAL_PATH)/ISupplicantStaNetworkCallback.hal

	$(transform-generated-source)

LOCAL_GENERATED_SOURCES += $(GEN)

include $(BUILD_STATIC_JAVA_LIBRARY)

wifi/supplicant/1.0/ISupplicantIface.hal

+11 −111

File changed.

Preview size limit exceeded, changes collapsed.

wifi/supplicant/1.0/ISupplicantNetwork.hal

+4 −680

File changed.

Preview size limit exceeded, changes collapsed.

wifi/supplicant/1.0/ISupplicantP2pIface.hal

0 → 100644
+45 −0

File added.

Preview size limit exceeded, changes collapsed.