commit 1861819f4d0c52617039ff5e4abdffb1e69c166b
author Colin Cross <ccross@android.com> Thu May 04 16:17:42 2017 -0700
committer Colin Cross <ccross@android.com> Fri May 05 20:02:58 2017 +0000
tree ec115037fe2937f9abb4db010853787df512e6bf
parent af4d169e3f3ed1f0ed474e56c01cd57678e00d0a

Move libmediandk and libcamera2ndk headers

Move libmediandk and libcamera2ndk headers into their module
and export them from there.  Also move them to the same path
relative to the export as used in the NDK, media/ for
libmediandk and camera/ for libcamera2ndk.

Test: builds
Change-Id: I0b424e0e48bfb5e2b762694a97d799de08f5dda3
(cherry picked from commit 7e8d4ba5887affda749978d787b898bf31fda729)

camera/ndk/Android.mk

diff --git a/camera/ndk/Android.mk b/camera/ndk/Android.mk
index 591dfc2..f5ff69d 100644
--- a/camera/ndk/Android.mk
+++ b/camera/ndk/Android.mk
@@ -33,9 +33,8 @@
 
 LOCAL_MODULE:= libcamera2ndk
 
-LOCAL_C_INCLUDES := \
-    frameworks/av/include/camera/ndk \
-    frameworks/av/include/ndk
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
 
 LOCAL_CFLAGS += -fvisibility=hidden -D EXPORT='__attribute__ ((visibility ("default")))'
 LOCAL_CFLAGS += -Wall -Wextra -Werror
@@ -49,7 +48,8 @@
     libcamera_client \
     libstagefright_foundation \
     libcutils \
-    libcamera_metadata
+    libcamera_metadata \
+    libmediandk
 
 include $(BUILD_SHARED_LIBRARY)