commit fa7b2ae0fd119b972d3d834b3e4c18a80f549d80
author Ray Essick <essick@google.com> Thu Feb 10 20:06:52 2022 -0800
committer Ray Essick <essick@google.com> Thu Feb 10 20:09:46 2022 -0800
tree 4eb7a4bc5a071a213ae1d3a40492800bda018c02
parent 4fde21961d8be4c4685bd43ad2eb2edafa8e94de

Replace include_dirs with header_libs

Cleaning out cross-module pathnames.

Bug: 201944383
Test: build
Change-Id: Ie6fca5233dc7c22ae19ee6d56065e86257c001ea

media/codec2/sfplugin/Android.bp

diff --git a/media/codec2/sfplugin/Android.bp b/media/codec2/sfplugin/Android.bp
index feeddb5..a73b493 100644
--- a/media/codec2/sfplugin/Android.bp
+++ b/media/codec2/sfplugin/Android.bp
@@ -7,6 +7,12 @@
     default_applicable_licenses: ["frameworks_av_license"],
 }
 
+cc_library_headers {
+    name: "libsfplugin_ccodec_internal_headers",
+    export_include_dirs: ["."],
+    // only for internal tests, perhaps restrict via visibility clause
+}
+
 cc_library_shared {
     name: "libsfplugin_ccodec",
 

media/codec2/sfplugin/tests/Android.bp

diff --git a/media/codec2/sfplugin/tests/Android.bp b/media/codec2/sfplugin/tests/Android.bp
index 92f3754..246e563 100644
--- a/media/codec2/sfplugin/tests/Android.bp
+++ b/media/codec2/sfplugin/tests/Android.bp
@@ -23,8 +23,8 @@
         "libcodec2-internal-defaults",
     ],
 
-    include_dirs: [
-        "frameworks/av/media/codec2/sfplugin",
+    header_libs: [
+        "libsfplugin_ccodec_internal_headers",
     ],
 
     shared_libs: [
@@ -60,13 +60,10 @@
         "MediaCodec_sanity_test.cpp",
     ],
 
-    include_dirs: [
-        "frameworks/av/media/codec2/sfplugin",
-    ],
-
     header_libs: [
         "libmediadrm_headers",
         "libmediametrics_headers",
+        "libsfplugin_ccodec_internal_headers",
     ],
 
     shared_libs: [