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

diff --git a/Android.mk b/Android.mk
index b25e39b..cd4855e 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -14,9 +14,6 @@
 
 LOCAL_PATH := $(call my-dir)
 wificond_cpp_flags := -Wall -Werror -Wno-unused-parameter
-ifdef WIFI_OFFLOAD_SCANS
-wificond_cpp_flags += -DWIFI_OFFLOAD_SCANS=\"$(WIFI_OFFLOAD_SCANS)\"
-endif
 wificond_parent_dir := $(LOCAL_PATH)/../
 wificond_includes := \
     $(wificond_parent_dir)

diff --git a/scanning/offload/offload_service_utils.cpp b/scanning/offload/offload_service_utils.cpp
index e7b7be8..ce25d85 100644 (file)
--- a/scanning/offload/offload_service_utils.cpp
+++ b/scanning/offload/offload_service_utils.cpp
@@ -40,12 +40,7 @@ OffloadDeathRecipient* OffloadServiceUtils::GetOffloadDeathRecipient(
 }
 
 bool OffloadServiceUtils::IsOffloadScanSupported() const {
-  bool result = false;
-#ifdef WIFI_OFFLOAD_SCANS
-  LOG(VERBOSE) << "Offload HAL supported";
-  result = true;
-#endif
-  return result;
+  return false;
 }
 
 std::shared_ptr<OffloadScanCallbackInterfaceImpl>