[AWARE]: Error code fix in NdpIndiatorRequest

[android-x86/hardware-libhardware_legacy.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index b0254f5..62ed210 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -1,7 +1,7 @@
 # Copyright 2006 The Android Open Source Project
 
 # Setting LOCAL_PATH will mess up all-subdir-makefiles, so do it beforehand.
-legacy_modules := power uevent wifi 
+legacy_modules := power uevent
 
 SAVE_MAKEFILES := $(call all-named-subdir-makefiles,$(legacy_modules))
 LEGACY_AUDIO_MAKEFILES := $(call all-named-subdir-makefiles,audio)
@@ -9,7 +9,8 @@ LEGACY_AUDIO_MAKEFILES := $(call all-named-subdir-makefiles,audio)
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_SHARED_LIBRARIES := libcutils liblog libmedia
+LOCAL_SHARED_LIBRARIES := libbase libcutils liblog libmedia
+LOCAL_EXPORT_SHARED_LIBRARY_HEADERS := libmedia
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
@@ -21,6 +22,11 @@ LOCAL_SHARED_LIBRARIES += libdl
 
 include $(SAVE_MAKEFILES)
 
+# TODO: Remove this line b/29915755
+ifndef BRILLO
+LOCAL_WHOLE_STATIC_LIBRARIES := libwifi-hal-common
+endif
+
 LOCAL_MODULE:= libhardware_legacy
 
 include $(BUILD_SHARED_LIBRARY)