commit 531c09ad843a067316f78eceaecff6bad48f4c56
author Treehugger Robot <treehugger-gerrit@google.com> Wed Sep 14 17:52:08 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 14 17:52:08 2016 +0000
tree 4b08948b289633c8d75cdea8c6b071ead3bec49a
parent b59a56582cdbfb1771f912b3f5220e0bb0c03759
parent f19b7a87b106bfab80cae06519fdf6830f435f33

Merge "Export libtinyalsa include directory."

Android.mk

diff --git a/Android.mk b/Android.mk
index 0c42e13..b3da408 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,73 +1,64 @@
 LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
-LOCAL_C_INCLUDES:= external/tinyalsa/include
 LOCAL_SRC_FILES:= mixer.c pcm.c
 LOCAL_MODULE := libtinyalsa
 LOCAL_SHARED_LIBRARIES:= libcutils libutils
 LOCAL_MODULE_TAGS := optional
 LOCAL_CFLAGS += -Werror
-
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
 include $(BUILD_SHARED_LIBRARY)
 
 ifeq ($(HOST_OS), linux)
 include $(CLEAR_VARS)
-LOCAL_C_INCLUDES:= external/tinyalsa/include
 LOCAL_SRC_FILES:= mixer.c pcm.c
 LOCAL_MODULE := libtinyalsa
 LOCAL_STATIC_LIBRARIES:= libcutils libutils
 LOCAL_CFLAGS += -Werror
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
 include $(BUILD_HOST_STATIC_LIBRARY)
 endif
 
 include $(CLEAR_VARS)
-LOCAL_C_INCLUDES:= external/tinyalsa/include
 LOCAL_SRC_FILES:= tinyplay.c
 LOCAL_MODULE := tinyplay
 LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa
 LOCAL_MODULE_TAGS := optional
 LOCAL_CFLAGS += -Werror
-
 include $(BUILD_EXECUTABLE)
 
 ifeq ($(HOST_OS), linux)
 include $(CLEAR_VARS)
-LOCAL_C_INCLUDES:= external/tinyalsa/include
 LOCAL_SRC_FILES:= tinyplay.c
 LOCAL_MODULE := tinyplay
 LOCAL_STATIC_LIBRARIES:= libcutils libutils libtinyalsa
 LOCAL_MODULE_TAGS := optional
 LOCAL_CFLAGS += -Werror
-
 include $(BUILD_HOST_EXECUTABLE)
 endif
 
 include $(CLEAR_VARS)
-LOCAL_C_INCLUDES:= external/tinyalsa/include
 LOCAL_SRC_FILES:= tinycap.c
 LOCAL_MODULE := tinycap
 LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa
 LOCAL_MODULE_TAGS := optional
 LOCAL_CFLAGS += -Werror
-
 include $(BUILD_EXECUTABLE)
 
 include $(CLEAR_VARS)
-LOCAL_C_INCLUDES:= external/tinyalsa/include
 LOCAL_SRC_FILES:= tinymix.c
 LOCAL_MODULE := tinymix
 LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa
 LOCAL_MODULE_TAGS := optional
 LOCAL_CFLAGS += -Werror
-
 include $(BUILD_EXECUTABLE)
 
 include $(CLEAR_VARS)
-LOCAL_C_INCLUDES:= external/tinyalsa/include
 LOCAL_SRC_FILES:= tinypcminfo.c
 LOCAL_MODULE := tinypcminfo
 LOCAL_SHARED_LIBRARIES:= libcutils libutils libtinyalsa
 LOCAL_MODULE_TAGS := optional
 LOCAL_CFLAGS += -Werror
-
 include $(BUILD_EXECUTABLE)