[AWARE]: Error code fix in NdpIndiatorRequest

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

diff --git a/Android.mk b/Android.mk
index 1faf6e2..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 vibrator wifi qemu qemu_tracing
+legacy_modules := power uevent
 
 SAVE_MAKEFILES := $(call all-named-subdir-makefiles,$(legacy_modules))
 LEGACY_AUDIO_MAKEFILES := $(call all-named-subdir-makefiles,audio)
@@ -9,17 +9,24 @@ LEGACY_AUDIO_MAKEFILES := $(call all-named-subdir-makefiles,audio)
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_SHARED_LIBRARIES := libcutils libwpa_client
+LOCAL_SHARED_LIBRARIES := libbase libcutils liblog libmedia
+LOCAL_EXPORT_SHARED_LIBRARY_HEADERS := libmedia
 
-LOCAL_INCLUDES += $(LOCAL_PATH)
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
 
-LOCAL_CFLAGS  += -DQEMU_HARDWARE
+LOCAL_CFLAGS  += -DQEMU_HARDWARE -Wno-unused-parameter -Wno-gnu-designator
 QEMU_HARDWARE := true
 
 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)
@@ -30,6 +37,8 @@ include $(CLEAR_VARS)
 LOCAL_MODULE:= libpower
 
 LOCAL_SRC_FILES += power/power.c
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -39,6 +48,8 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := libpower
 
 LOCAL_SRC_FILES := power/power.c
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
 
 LOCAL_SHARED_LIBRARIES := libcutils