diff options
| author | Etan Cohen <etancohen@google.com> | 2016-12-13 16:22:55 -0800 |
|---|---|---|
| committer | Etan Cohen <etancohen@google.com> | 2016-12-13 16:22:55 -0800 |
| commit | 25ae65f828b53d2f2d1f5dea2f5f7e70720350c9 (patch) | |
| tree | c3cd306834db538e3f44acd415449a590effe746 | |
| parent | c8701c8ad058ec7fa69a2e3c60495f27708bced5 (diff) | |
[AWARE] Remove non-standard build configuration of Wi-Fi Aware
Always build Wi-Fi Aware service code (doesn't imply that feature
is available on device).
Bug: 33594222
Test: build and run on devices with & without feature
Change-Id: I6ec88788b6c741ea02832253709d05797be1d824
| -rw-r--r-- | service/Android.mk | 11 | ||||
| -rw-r--r-- | tests/wifitests/Android.mk | 11 |
2 files changed, 2 insertions, 20 deletions
diff --git a/service/Android.mk b/service/Android.mk index 3dac559f0..3b9eb43bd 100644 --- a/service/Android.mk +++ b/service/Android.mk @@ -37,12 +37,8 @@ LOCAL_SHARED_LIBRARIES += \ LOCAL_SRC_FILES := \ jni/com_android_server_wifi_WifiNative.cpp \ - jni/jni_helper.cpp - -ifeq ($(BOARD_HAS_AWARE), true) -LOCAL_SRC_FILES += \ + jni/jni_helper.cpp \ jni/com_android_server_wifi_aware_WifiAwareNative.cpp -endif LOCAL_MODULE := libwifi-service @@ -63,11 +59,6 @@ LOCAL_SRC_FILES := $(call all-java-files-under, java) \ $(call all-logtags-files-under, java) \ $(call all-proto-files-under, proto) -ifneq ($(BOARD_HAS_AWARE), true) -LOCAL_SRC_FILES := $(filter-out $(call all-java-files-under, \ - java/com/android/server/wifi/aware),$(LOCAL_SRC_FILES)) -endif - LOCAL_JAVA_LIBRARIES := bouncycastle conscrypt jsr305 services LOCAL_REQUIRED_MODULES := services LOCAL_MODULE_TAGS := diff --git a/tests/wifitests/Android.mk b/tests/wifitests/Android.mk index 08677bb8b..cb8504cd5 100644 --- a/tests/wifitests/Android.mk +++ b/tests/wifitests/Android.mk @@ -32,12 +32,8 @@ LOCAL_C_INCLUDES += \ packages/apps/Test/connectivity/sl4n/rapidjson/include \ LOCAL_SRC_FILES := \ - jni/wifi_hal_mock.cpp - -ifeq ($(BOARD_HAS_AWARE), true) -LOCAL_SRC_FILES += \ + jni/wifi_hal_mock.cpp \ jni/wifi_aware_hal_mock.cpp -endif LOCAL_MODULE := libwifi-hal-mock @@ -62,11 +58,6 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-subdir-java-files) -ifneq ($(BOARD_HAS_AWARE), true) -LOCAL_SRC_FILES := $(filter-out $(call all-java-files-under, \ - src/com/android/server/wifi/aware),$(LOCAL_SRC_FILES)) -endif - # Provide jack a list of classes to exclude form code coverage # This list is generated from the java source files in this module # The list is a comma separated list of class names with * matching zero or more characters. |