From 48f8e5d6be9f3495562115057c6a1e260853e635 Mon Sep 17 00:00:00 2001 From: Tri Vo Date: Fri, 4 Aug 2017 10:36:07 -0700 Subject: [PATCH] Wifi supplicant test statically links to dependencies. This test now statically links to libs not guaranteed to be on the device. Bug: 64040096 Test: compiles Change-Id: I986e61835e641e15bdad0ff9571ee8ffa59b2a46 --- wifi/Android.bp | 1 + wifi/supplicant/1.0/vts/functional/Android.bp | 37 ++++++++++++++++ wifi/supplicant/1.0/vts/functional/Android.mk | 44 ------------------- 3 files changed, 38 insertions(+), 44 deletions(-) create mode 100644 wifi/supplicant/1.0/vts/functional/Android.bp delete mode 100644 wifi/supplicant/1.0/vts/functional/Android.mk diff --git a/wifi/Android.bp b/wifi/Android.bp index b4ab98ffef..1153b0c628 100644 --- a/wifi/Android.bp +++ b/wifi/Android.bp @@ -7,4 +7,5 @@ subdirs = [ "offload/1.0", "offload/1.0/vts/functional", "supplicant/1.0", + "supplicant/1.0/vts/functional", ] diff --git a/wifi/supplicant/1.0/vts/functional/Android.bp b/wifi/supplicant/1.0/vts/functional/Android.bp new file mode 100644 index 0000000000..24b9f6f71f --- /dev/null +++ b/wifi/supplicant/1.0/vts/functional/Android.bp @@ -0,0 +1,37 @@ +// +// 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. +// + +cc_test { + name: "VtsHalWifiSupplicantV1_0TargetTest", + defaults: ["VtsHalTargetTestDefaults"], + srcs: [ + "VtsHalWifiSupplicantV1_0TargetTest.cpp", + "supplicant_hidl_test.cpp", + "supplicant_hidl_test_utils.cpp", + "supplicant_p2p_iface_hidl_test.cpp", + "supplicant_sta_iface_hidl_test.cpp", + "supplicant_sta_network_hidl_test.cpp", + ], + static_libs: [ + "VtsHalWifiV1_0TargetTestUtil", + "android.hardware.wifi.supplicant@1.0", + "android.hardware.wifi@1.0", + "libcrypto", + "libgmock", + "libwifi-system", + "libwifi-system-iface", + ], +} diff --git a/wifi/supplicant/1.0/vts/functional/Android.mk b/wifi/supplicant/1.0/vts/functional/Android.mk deleted file mode 100644 index c6e39503d4..0000000000 --- a/wifi/supplicant/1.0/vts/functional/Android.mk +++ /dev/null @@ -1,44 +0,0 @@ -# -# Copyright (C) 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. -# -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_MODULE := VtsHalWifiSupplicantV1_0TargetTest -LOCAL_CPPFLAGS := -Wall -Werror -Wextra -LOCAL_SRC_FILES := \ - VtsHalWifiSupplicantV1_0TargetTest.cpp \ - supplicant_hidl_test.cpp \ - supplicant_hidl_test_utils.cpp \ - supplicant_p2p_iface_hidl_test.cpp \ - supplicant_sta_iface_hidl_test.cpp \ - supplicant_sta_network_hidl_test.cpp -LOCAL_SHARED_LIBRARIES := \ - android.hardware.wifi.supplicant@1.0 \ - android.hardware.wifi@1.0 \ - libbase \ - libcutils \ - libhidlbase \ - libhidltransport \ - liblog \ - libutils \ - libwifi-system \ - libwifi-system-iface -LOCAL_STATIC_LIBRARIES := \ - libgmock \ - VtsHalHidlTargetTestBase \ - VtsHalWifiV1_0TargetTestUtil -include $(BUILD_NATIVE_TEST) -