Cleaning out media references in include_dirs
replacing with header_libs or existing shared_libs/static_libs.
In some cases, they weren't being used at all.
Bug: 201944383
Test: build
Change-Id: I0042732ab17d71ca22d91d0e17fc672715b9e241
diff --git a/media/libmediaplayerservice/datasource/Android.bp b/media/libmediaplayerservice/datasource/Android.bp
index 19fc172..fea0332 100644
--- a/media/libmediaplayerservice/datasource/Android.bp
+++ b/media/libmediaplayerservice/datasource/Android.bp
@@ -19,7 +19,6 @@
],
header_libs: [
- "media_ndk_headers",
"libmedia_headers",
],
diff --git a/media/libstagefright/omx/tests/Android.bp b/media/libstagefright/omx/tests/Android.bp
index 83cc80e..159fd19 100644
--- a/media/libstagefright/omx/tests/Android.bp
+++ b/media/libstagefright/omx/tests/Android.bp
@@ -43,7 +43,6 @@
header_libs: [
"libbase_headers",
"libmediametrics_headers",
- "media_ndk_headers",
],
cflags: [
diff --git a/media/libstagefright/webm/Android.bp b/media/libstagefright/webm/Android.bp
index 9d5f430..6ed3e0e 100644
--- a/media/libstagefright/webm/Android.bp
+++ b/media/libstagefright/webm/Android.bp
@@ -50,7 +50,6 @@
header_libs: [
"av-headers",
"libmedia_headers",
- "media_ndk_headers",
],
}
diff --git a/media/ndk/Android.bp b/media/ndk/Android.bp
index f7bc177..ddc71db 100644
--- a/media/ndk/Android.bp
+++ b/media/ndk/Android.bp
@@ -63,6 +63,7 @@
}
// for use with header_libs
+// supports use as <media/NdkMediaExtractor.h> not <NdkMediaExtractor.h>
cc_library_headers {
name: "media_ndk_headers",
vendor_available: true,
@@ -103,8 +104,6 @@
],
include_dirs: [
- "frameworks/base/core/jni",
- "frameworks/native/include/media/openmax",
"system/media/camera/include",
],
@@ -178,6 +177,9 @@
"NdkMediaDataSourceCallbacks.cpp",
],
+ local_include_dirs: [
+ "include",
+ ],
export_include_dirs: [
"include",
@@ -192,6 +194,7 @@
header_libs: [
"libstagefright_headers",
"libmedia_headers",
+ "libstagefright_headers",
],
shared_libs: [
diff --git a/services/camera/libcameraservice/Android.bp b/services/camera/libcameraservice/Android.bp
index 3626378..b61bc09 100644
--- a/services/camera/libcameraservice/Android.bp
+++ b/services/camera/libcameraservice/Android.bp
@@ -185,7 +185,6 @@
include_dirs: [
"system/media/private/camera/include",
"frameworks/native/include/media/openmax",
- "frameworks/av/media/ndk",
"external/dynamic_depth/includes",
"external/dynamic_depth/internal",
],
@@ -245,4 +244,4 @@
"-Wno-ignored-qualifiers",
],
-}
\ No newline at end of file
+}