diff options
author | Sohani Rao | 2017-08-18 16:24:00 -0500 |
---|---|---|
committer | android-build-merger | 2017-08-18 16:24:00 -0500 |
commit | f74f00f7f928e9617ae509e5eedab4e60aa9828d (patch) | |
tree | 74c9b3cb35727cbd7e1231c96ab9ce6a044d59fe | |
parent | c9bcea5f47da0f53d1550f3836b873a507497c2d (diff) | |
parent | 5002120904c475e3b5a827a56543cf3d5a8f33ac (diff) | |
download | system-connectivity-wificond-f74f00f7f928e9617ae509e5eedab4e60aa9828d.tar.gz system-connectivity-wificond-f74f00f7f928e9617ae509e5eedab4e60aa9828d.tar.xz system-connectivity-wificond-f74f00f7f928e9617ae509e5eedab4e60aa9828d.zip |
Conditional compile flags not allowed in BoardConfig
am: 5002120904
Change-Id: If00bbc99c8dce35e1cb6e3d85a009d4ca90a1568
-rw-r--r-- | Android.mk | 3 | ||||
-rw-r--r-- | scanning/offload/offload_service_utils.cpp | 7 |
2 files changed, 1 insertions, 9 deletions
@@ -14,9 +14,6 @@ | |||
14 | 14 | ||
15 | LOCAL_PATH := $(call my-dir) | 15 | LOCAL_PATH := $(call my-dir) |
16 | wificond_cpp_flags := -Wall -Werror -Wno-unused-parameter | 16 | wificond_cpp_flags := -Wall -Werror -Wno-unused-parameter |
17 | ifdef WIFI_OFFLOAD_SCANS | ||
18 | wificond_cpp_flags += -DWIFI_OFFLOAD_SCANS=\"$(WIFI_OFFLOAD_SCANS)\" | ||
19 | endif | ||
20 | wificond_parent_dir := $(LOCAL_PATH)/../ | 17 | wificond_parent_dir := $(LOCAL_PATH)/../ |
21 | wificond_includes := \ | 18 | wificond_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 | ||
42 | bool OffloadServiceUtils::IsOffloadScanSupported() const { | 42 | bool 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 | ||
51 | std::shared_ptr<OffloadScanCallbackInterfaceImpl> | 46 | std::shared_ptr<OffloadScanCallbackInterfaceImpl> |