am 35edc538: Merge "Prepare to remove libhardware_legacy from global include dirs"

* commit '35edc53853877e6998e117357902579147f3e7e4':
  Prepare to remove libhardware_legacy from global include dirs

diff --git a/Android.mk b/Android.mk
index 0a82a1f..aab0963 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -11,7 +11,8 @@ include $(CLEAR_VARS)
 
 LOCAL_SHARED_LIBRARIES := libcutils liblog
 
-LOCAL_INCLUDES += $(LOCAL_PATH)
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
 
 LOCAL_CFLAGS  += -DQEMU_HARDWARE
 QEMU_HARDWARE := true
@@ -30,6 +31,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 +42,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
 

diff --git a/audio/Android.mk b/audio/Android.mk
index eaf5a6b..3518bad 100644 (file)
--- a/audio/Android.mk
+++ b/audio/Android.mk
@@ -11,9 +11,10 @@ LOCAL_SRC_FILES := \
     audio_hw_hal.cpp
 
 LOCAL_MODULE := libaudiohw_legacy
-LOCAL_MODULE_TAGS := optional
 LOCAL_STATIC_LIBRARIES := libmedia_helper
 LOCAL_CFLAGS := -Wno-unused-parameter
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -30,8 +31,9 @@ endif
 
 LOCAL_STATIC_LIBRARIES := libmedia_helper
 LOCAL_MODULE := libaudiopolicy_legacy
-LOCAL_MODULE_TAGS := optional
 LOCAL_CFLAGS += -Wno-unused-parameter
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -55,8 +57,8 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
 
 LOCAL_MODULE := audio_policy.default
 LOCAL_MODULE_RELATIVE_PATH := hw
-LOCAL_MODULE_TAGS := optional
 LOCAL_CFLAGS := -Wno-unused-parameter
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include
 
 include $(BUILD_SHARED_LIBRARY)