commit 6df26071a5b581a90a6719a6dc03c212073dca71
author Jayant Chowdhary <jchowdhary@google.com> Tue Nov 06 23:55:12 2018 -0800
committer Jayant Chowdhary <jchowdhary@google.com> Fri Nov 16 10:04:22 2018 -0800
tree bc25beaef80c37fa9b32df72b3dd0d19ec89f49a
parent dcfd26eeac36f41dff92cab15f47512711b540cf

Create a vendor available version of libcamera2ndk.

Bug: 110364143

Test: mm -j64
Test: AImageReaderVendorTest

Change-Id: Ic9343cc7fb10eb374197945b72be59e7ce8282fe
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>

camera/ndk/NdkCameraManager.cpp

diff --git a/camera/ndk/NdkCameraManager.cpp b/camera/ndk/NdkCameraManager.cpp
index f14a4c9..8742d9c 100644
--- a/camera/ndk/NdkCameraManager.cpp
+++ b/camera/ndk/NdkCameraManager.cpp
@@ -22,10 +22,15 @@
 #include <utils/Trace.h>
 
 #include <camera/NdkCameraManager.h>
+
+#ifdef __ANDROID_VNDK__
+#include "ndk_vendor/impl/ACameraManager.h"
+#else
 #include "impl/ACameraManager.h"
+#endif
 #include "impl/ACameraMetadata.h"
 
-using namespace android;
+using namespace android::acam;
 
 EXPORT
 ACameraManager* ACameraManager_create() {