commit ce7594d6c9112e52f197330ca5073528f9ac638a
author Austin Borger <borgera@google.com> Tue Feb 22 22:21:38 2022 +0000
committer Austin Borger <borgera@google.com> Wed Feb 23 22:51:47 2022 +0000
tree 86f53c31aaa775e1247b1e8a9e6a65d53e98bae9
parent 04f3e76b78702f620c435e6a72220ede72a21e33

libcameraservice Use the libdynamic_depth header libraries instead of
manually adding their include directories.

Bug: 213330471
Test: Built libcameraservice locally.
Change-Id: Ifa25fe9705e6da6e31396b1a7060f7217d44d81d
(cherry picked from commit 53469b996e1124feea092008d206ce91ed826812)

services/camera/libcameraservice/Android.bp

diff --git a/services/camera/libcameraservice/Android.bp b/services/camera/libcameraservice/Android.bp
index b61bc09..69300be 100644
--- a/services/camera/libcameraservice/Android.bp
+++ b/services/camera/libcameraservice/Android.bp
@@ -105,6 +105,8 @@
     ],
 
     header_libs: [
+        "libdynamic_depth-internal_headers",
+        "libdynamic_depth-public_headers",
         "libmediadrm_headers",
         "libmediametrics_headers",
     ],
@@ -185,8 +187,6 @@
     include_dirs: [
         "system/media/private/camera/include",
         "frameworks/native/include/media/openmax",
-        "external/dynamic_depth/includes",
-        "external/dynamic_depth/internal",
     ],
 
     export_include_dirs: ["."],
@@ -216,6 +216,11 @@
         "utils/SessionConfigurationUtilsHost.cpp",
     ],
 
+    header_libs: [
+        "libdynamic_depth-internal_headers",
+        "libdynamic_depth-public_headers",
+    ],
+
     shared_libs: [
         "libbase",
         "libbinder",
@@ -229,8 +234,6 @@
     ],
 
     include_dirs: [
-        "external/dynamic_depth/includes",
-        "external/dynamic_depth/internal",
         "frameworks/av/camera/include",
         "frameworks/av/camera/include/camera",
     ],