summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSohani Rao2017-08-10 14:10:12 -0500
committerSohani Rao2017-08-11 19:44:36 -0500
commit5002120904c475e3b5a827a56543cf3d5a8f33ac (patch)
tree74c9b3cb35727cbd7e1231c96ab9ce6a044d59fe
parent8f574ac480a39accc9fe5a5f065f4212e8175bd5 (diff)
downloadsystem-connectivity-wificond-5002120904c475e3b5a827a56543cf3d5a8f33ac.tar.gz
system-connectivity-wificond-5002120904c475e3b5a827a56543cf3d5a8f33ac.tar.xz
system-connectivity-wificond-5002120904c475e3b5a827a56543cf3d5a8f33ac.zip
Conditional compile flags not allowed in BoardConfig
The assumption that the Boardconfig.mk will export a flag that will determine support for a feature is incorrect. Remove using of this assumed flag from wificond. Bug: 32842314 Test: Unit tests, On device test Change-Id: I3aa33318a5e220a30f9950a7bb9488058f1421b9
-rw-r--r--Android.mk3
-rw-r--r--scanning/offload/offload_service_utils.cpp7
2 files changed, 1 insertions, 9 deletions
diff --git a/Android.mk b/Android.mk
index b25e39b..cd4855e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,9 +14,6 @@
14 14
15LOCAL_PATH := $(call my-dir) 15LOCAL_PATH := $(call my-dir)
16wificond_cpp_flags := -Wall -Werror -Wno-unused-parameter 16wificond_cpp_flags := -Wall -Werror -Wno-unused-parameter
17ifdef WIFI_OFFLOAD_SCANS
18wificond_cpp_flags += -DWIFI_OFFLOAD_SCANS=\"$(WIFI_OFFLOAD_SCANS)\"
19endif
20wificond_parent_dir := $(LOCAL_PATH)/../ 17wificond_parent_dir := $(LOCAL_PATH)/../
21wificond_includes := \ 18wificond_includes := \
22 $(wificond_parent_dir) 19 $(wificond_parent_dir)
diff --git a/scanning/offload/offload_service_utils.cpp b/scanning/offload/offload_service_utils.cpp
index e7b7be8..ce25d85 100644
--- a/scanning/offload/offload_service_utils.cpp
+++ b/scanning/offload/offload_service_utils.cpp
@@ -40,12 +40,7 @@ OffloadDeathRecipient* OffloadServiceUtils::GetOffloadDeathRecipient(
40} 40}
41 41
42bool OffloadServiceUtils::IsOffloadScanSupported() const { 42bool OffloadServiceUtils::IsOffloadScanSupported() const {
43 bool result = false; 43 return false;
44#ifdef WIFI_OFFLOAD_SCANS
45 LOG(VERBOSE) << "Offload HAL supported";
46 result = true;
47#endif
48 return result;
49} 44}
50 45
51std::shared_ptr<OffloadScanCallbackInterfaceImpl> 46std::shared_ptr<OffloadScanCallbackInterfaceImpl>