diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-04-20 01:39:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-04-20 01:39:24 +0000 |
| commit | bbb34492362f266beae1fe05fb9eed32e59b4a79 (patch) | |
| tree | fc0a078aa5937172e080ebf72459a0eae7d389e4 | |
| parent | fdc5deaef5eeb9c9641ec791801fb666283d7d9b (diff) | |
| parent | 2cb24538b7e7339425b7de8b69a6db7d361be4c8 (diff) | |
Merge changes from topic 'system-vendor-internal-pick'
* changes:
libwifi-hal-common: Work with BOARD_VNDK_VERSION
FrameworksWifiTests: Remove system -> vendor dep.
libwifi-hal-(common|fallback): LOCAL_VENDOR_MODULE
| -rw-r--r-- | libwifi_hal/Android.mk | 3 | ||||
| -rw-r--r-- | tests/wifitests/Android.mk | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libwifi_hal/Android.mk b/libwifi_hal/Android.mk index a34075d6f..b06171f1d 100644 --- a/libwifi_hal/Android.mk +++ b/libwifi_hal/Android.mk @@ -64,9 +64,11 @@ endif # ============================================================ include $(CLEAR_VARS) LOCAL_MODULE := libwifi-hal-common +LOCAL_VENDOR_MODULE := true LOCAL_CFLAGS := $(wifi_hal_cflags) LOCAL_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_SHARED_LIBRARIES := libbase +LOCAL_HEADER_LIBRARIES := libcutils_headers LOCAL_SRC_FILES := wifi_hal_common.cpp include $(BUILD_STATIC_LIBRARY) @@ -75,6 +77,7 @@ include $(BUILD_STATIC_LIBRARY) # ============================================================ include $(CLEAR_VARS) LOCAL_MODULE := libwifi-hal-fallback +LOCAL_VENDOR_MODULE := true LOCAL_CFLAGS := $(wifi_hal_cflags) LOCAL_SRC_FILES := wifi_hal_fallback.cpp LOCAL_HEADER_LIBRARIES := libhardware_legacy_headers diff --git a/tests/wifitests/Android.mk b/tests/wifitests/Android.mk index b285db6e9..5dbd75617 100644 --- a/tests/wifitests/Android.mk +++ b/tests/wifitests/Android.mk @@ -100,7 +100,6 @@ LOCAL_JNI_SHARED_LIBRARIES := \ libstagefright_foundation \ libstdc++ \ libsync \ - libwifi-hal \ libwifi-system \ libui \ libunwind \ |