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

Commit 220d98c1 authored by Roshan Pius's avatar Roshan Pius Committed by Android (Google) Code Review
Browse files

Merge changes I017d3528,Ie5444041,Iff873784,I1049176a,I8575df02, ... 

* changes:
  wifi(implementation): Load wifi driver on IWifi.start()
  wifi(implementation): Different names for concurrent ifaces
  wifi(implementation): Add iface combo for 2018
  wifi(implementation): Unit tests for V1 & V2 iface combos
  wifi(implementation): Add unit test framework
  wifi(implementation): Support multiple ifaces of same type
parents b3258731 8fc6d170

wifi/1.2/default/Android.mk

+67 −2
Original line number Diff line number Diff line
@@ -13,21 +13,27 @@ 
# limitations under the License.

LOCAL_PATH := $(call my-dir)



###

### android.hardware.wifi static library

###

include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.wifi@1.0-service

LOCAL_MODULE := android.hardware.wifi@1.0-service-lib

LOCAL_MODULE_RELATIVE_PATH := hw

LOCAL_PROPRIETARY_MODULE := true

LOCAL_CPPFLAGS := -Wall -Werror -Wextra

ifdef WIFI_HIDL_FEATURE_AWARE

LOCAL_CPPFLAGS += -DWIFI_HIDL_FEATURE_AWARE

endif

ifdef WIFI_HIDL_FEATURE_DUAL_INTERFACE

LOCAL_CPPFLAGS += -DWIFI_HIDL_FEATURE_DUAL_INTERFACE

endif

LOCAL_SRC_FILES := \

    hidl_struct_util.cpp \

    hidl_sync_util.cpp \

    service.cpp \

    wifi.cpp \

    wifi_ap_iface.cpp \

    wifi_chip.cpp \

    wifi_feature_flags.cpp \

    wifi_legacy_hal.cpp \

    wifi_legacy_hal_stubs.cpp \

    wifi_mode_controller.cpp \
@@ -49,5 +55,64 @@ LOCAL_SHARED_LIBRARIES := \ 
    android.hardware.wifi@1.0 \

    android.hardware.wifi@1.1 \

    android.hardware.wifi@1.2

LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)

include $(BUILD_STATIC_LIBRARY)



###

### android.hardware.wifi daemon

###

include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.wifi@1.0-service

LOCAL_MODULE_RELATIVE_PATH := hw

LOCAL_PROPRIETARY_MODULE := true

LOCAL_CPPFLAGS := -Wall -Werror -Wextra

LOCAL_SRC_FILES := \

    service.cpp

LOCAL_SHARED_LIBRARIES := \

    libbase \

    libcutils \

    libhidlbase \

    libhidltransport \

    liblog \

    libnl \

    libutils \

    libwifi-hal \

    libwifi-system-iface \

    android.hardware.wifi@1.0 \

    android.hardware.wifi@1.1 \

    android.hardware.wifi@1.2

LOCAL_STATIC_LIBRARIES := \

    android.hardware.wifi@1.0-service-lib

LOCAL_INIT_RC := android.hardware.wifi@1.0-service.rc

include $(BUILD_EXECUTABLE)



###

### android.hardware.wifi unit tests.

###

include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.wifi@1.0-service-tests

LOCAL_PROPRIETARY_MODULE := true

LOCAL_SRC_FILES := \

    tests/main.cpp \

    tests/mock_wifi_feature_flags.cpp \

    tests/mock_wifi_legacy_hal.cpp \

    tests/mock_wifi_mode_controller.cpp \

    tests/wifi_chip_unit_tests.cpp

LOCAL_STATIC_LIBRARIES := \

    libgmock \

    libgtest \

    android.hardware.wifi@1.0-service-lib

LOCAL_SHARED_LIBRARIES := \

    libbase \

    libcutils \

    libhidlbase \

    libhidltransport \

    liblog \

    libnl \

    libutils \

    libwifi-hal \

    libwifi-system-iface \

    android.hardware.wifi@1.0 \

    android.hardware.wifi@1.1 \

    android.hardware.wifi@1.2

include $(BUILD_NATIVE_TEST)

wifi/1.2/default/service.cpp

+12 −1
Original line number Diff line number Diff line
@@ -20,9 +20,17 @@ 
#include <utils/StrongPointer.h>



#include "wifi.h"

#include "wifi_feature_flags.h"

#include "wifi_legacy_hal.h"

#include "wifi_mode_controller.h"



using android::hardware::configureRpcThreadpool;

using android::hardware::joinRpcThreadpool;

using android::hardware::wifi::V1_2::implementation::feature_flags::

    WifiFeatureFlags;

using android::hardware::wifi::V1_2::implementation::legacy_hal::WifiLegacyHal;

using android::hardware::wifi::V1_2::implementation::mode_controller::

    WifiModeController;



int main(int /*argc*/, char** argv) {

    android::base::InitLogging(
@@ -33,7 +41,10 @@ int main(int /*argc*/, char** argv) { 


    // Setup hwbinder service

    android::sp<android::hardware::wifi::V1_2::IWifi> service =

        new android::hardware::wifi::V1_2::implementation::Wifi();

        new android::hardware::wifi::V1_2::implementation::Wifi(

            std::make_shared<WifiLegacyHal>(),

            std::make_shared<WifiModeController>(),

            std::make_shared<WifiFeatureFlags>());

    CHECK_EQ(service->registerAsService(), android::NO_ERROR)

        << "Failed to register wifi HAL";

wifi/1.2/default/tests/main.cpp

0 → 100644
+28 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 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.

 */



#include <gmock/gmock.h>

#include <gtest/gtest.h>



#include <android-base/logging.h>



int main(int argc, char** argv) {

    ::testing::InitGoogleTest(&argc, argv);

    ::testing::InitGoogleMock(&argc, argv);

    // Force ourselves to always log to stderr

    android::base::InitLogging(argv, android::base::StderrLogger);

    return RUN_ALL_TESTS();

}

wifi/1.2/default/tests/mock_wifi_feature_flags.cpp

0 → 100644
+35 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 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.

 */



#include <gmock/gmock.h>



#include "mock_wifi_feature_flags.h"



namespace android {

namespace hardware {

namespace wifi {

namespace V1_2 {

namespace implementation {

namespace feature_flags {



MockWifiFeatureFlags::MockWifiFeatureFlags() {}



}  // namespace feature_flags

}  // namespace implementation

}  // namespace V1_2

}  // namespace wifi

}  // namespace hardware

}  // namespace android

wifi/1.2/default/tests/mock_wifi_feature_flags.h

0 → 100644
+46 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 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.

 */



#ifndef MOCK_WIFI_FEATURE_FLAGS_H_

#define MOCK_WIFI_FEATURE_FLAGS_H_



#include <gmock/gmock.h>



#include "wifi_feature_flags.h"



namespace android {

namespace hardware {

namespace wifi {

namespace V1_2 {

namespace implementation {

namespace feature_flags {



class MockWifiFeatureFlags : public WifiFeatureFlags {

   public:

    MockWifiFeatureFlags();



    MOCK_METHOD0(isAwareSupported, bool());

    MOCK_METHOD0(isDualInterfaceSupported, bool());

};



}  // namespace feature_flags

}  // namespace implementation

}  // namespace V1_2

}  // namespace wifi

}  // namespace hardware

}  // namespace android



#endif  // MOCK_WIFI_FEATURE_FLAGS_H_