commit cbf174b59307290e4c80947232feedb4cc9c0c26
author Emilian Peev <epeev@google.com> Fri Jan 25 14:38:59 2019 -0800
committer Emilian Peev <epeev@google.com> Sun Jan 27 19:58:55 2019 -0800
tree b0f8827388ee27877d4b1786e8f8b8f4f7a252fe
parent 538c90e79d06f99e8a2dda4b1ccf3a5e46062934

Camera: Link dynamically to Depth photo library

Move all depth photo specific processing in a separate
library and link to it dynamically.

Bug: 109735087
Test: Camera CTS
Change-Id: I00a20b26fc9a1d127ad962a36b5b554dd36f0d41

services/camera/libcameraservice/Android.bp

diff --git a/services/camera/libcameraservice/Android.bp b/services/camera/libcameraservice/Android.bp
index 3b362d6..a090479 100644
--- a/services/camera/libcameraservice/Android.bp
+++ b/services/camera/libcameraservice/Android.bp
@@ -67,9 +67,7 @@
     ],
 
     shared_libs: [
-        "libimage_io",
-        "libdynamic_depth",
-        "libxml2",
+        "libdl",
         "libui",
         "liblog",
         "libutilscallstack",
@@ -127,3 +125,38 @@
     ],
 
 }
+
+cc_library_shared {
+    name: "libdepthphoto",
+
+    srcs: [
+        "common/DepthPhotoProcessor.cpp",
+    ],
+
+    shared_libs: [
+        "libimage_io",
+        "libdynamic_depth",
+        "libxml2",
+        "liblog",
+        "libutilscallstack",
+        "libutils",
+        "libcutils",
+        "libjpeg",
+        "libmemunreachable",
+    ],
+
+    include_dirs: [
+        "external/dynamic_depth/includes",
+        "external/dynamic_depth/internal",
+    ],
+
+    export_include_dirs: ["."],
+
+    cflags: [
+        "-Wall",
+        "-Wextra",
+        "-Werror",
+        "-Wno-ignored-qualifiers",
+    ],
+
+}