commit 5c5f857f8601d2ef8c8ad56292b9498a6def7f2e
author Elliott Hughes <enh@google.com> Sat Sep 17 01:46:11 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat Sep 17 01:46:11 2016 +0000
tree 9023911b36acf7c4a3516ac0875a2ac212e57369
parent b3613c58f7052520bf5be92c6c1c3f4799713520
parent 0468e8a34cf0f78246f64744469c7d35cba7db96

Move libusbhost's headers into libusbhost. am: e0a7c773ed am: d141edfb3c am: 1cde9655bb
am: c6dd9aaf5c

Change-Id: I4ba3a219eb6b3ebcb1fd228fb50587e70440b9a9

libusbhost/Android.mk

diff --git a/libusbhost/Android.mk b/libusbhost/Android.mk
index 5c12f2c..9439846 100644
--- a/libusbhost/Android.mk
+++ b/libusbhost/Android.mk
@@ -22,11 +22,11 @@
 ifeq ($(HOST_OS),linux)
 
 include $(CLEAR_VARS)
-
 LOCAL_MODULE := libusbhost
 LOCAL_SRC_FILES := usbhost.c
 LOCAL_CFLAGS := -Werror
-
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 endif
@@ -35,24 +35,22 @@
 # ========================================================
 
 include $(CLEAR_VARS)
-
 LOCAL_MODULE := libusbhost
 LOCAL_SRC_FILES := usbhost.c
-
 LOCAL_CFLAGS := -g -DUSE_LIBLOG -Werror
-
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
 # needed for logcat
 LOCAL_SHARED_LIBRARIES := libcutils
-
 include $(BUILD_SHARED_LIBRARY)
 
 # Static library for target
 # ========================================================
 
 include $(CLEAR_VARS)
-
 LOCAL_MODULE := libusbhost
 LOCAL_SRC_FILES := usbhost.c
 LOCAL_CFLAGS := -Werror
-
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
 include $(BUILD_STATIC_LIBRARY)

libusbhost/include/usbhost/usbhost.h

diff --git a/include/usbhost/usbhost.h b/libusbhost/include/usbhost/usbhost.h
similarity index 100%
rename from include/usbhost/usbhost.h
rename to libusbhost/include/usbhost/usbhost.h