diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2015-09-28 21:49:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-28 21:49:11 +0000 |
| commit | 0f7bacf295f1a0e1beb6f55504cbde08f920b771 (patch) | |
| tree | d995ebb519ad2c93c7f1deba799f30c46d6c4de8 | |
| parent | eea5d8878d67298a81aaf0d85dd5c9f2f9742b83 (diff) | |
| parent | 35edc53853877e6998e117357902579147f3e7e4 (diff) | |
| download | libhardware_legacy-brillo-m7-release.tar.gz | |
am 35edc538: Merge "Prepare to remove libhardware_legacy from global include dirs"brillo-m7-releasebrillo-m7-mr-devbrillo-m7-dev
* commit '35edc53853877e6998e117357902579147f3e7e4':
Prepare to remove libhardware_legacy from global include dirs
| -rw-r--r-- | Android.mk | 7 | ||||
| -rw-r--r-- | audio/Android.mk | 8 |
2 files changed, 11 insertions, 4 deletions
@@ -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 --- 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) |