commit c9495e8a9deacc88757deb7ba52f00fbafd247e0
author Austin Borger <borgera@google.com> Thu Feb 24 23:13:29 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 24 23:13:29 2022 +0000
tree da3cd2d9cc1b8207e42c8323d4d4e9517aa80967
parent b428b0099c094afb8b1e783066a20c4ff5700a5e
parent ce7594d6c9112e52f197330ca5073528f9ac638a

Merge "libcameraservice Use the libdynamic_depth header libraries instead of manually adding their include directories." into tm-dev

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",
     ],