Create libcodec2_headers
Also, move libcodec2 to media/codec2/core.
Test: Builds
Bug: 112362730
Bug: 119853704
Change-Id: Ie2d03724a052ff55d607aa04417280682e51ae69
diff --git a/media/codec2/Android.bp b/media/codec2/core/Android.bp
similarity index 71%
rename from media/codec2/Android.bp
rename to media/codec2/core/Android.bp
index 576677a..b723755 100644
--- a/media/codec2/Android.bp
+++ b/media/codec2/core/Android.bp
@@ -1,3 +1,9 @@
+cc_library_headers {
+ name: "libcodec2_headers",
+ vendor_available: true,
+ export_include_dirs: ["include"],
+}
+
cc_library_shared {
name: "libcodec2",
vendor_available: true,
@@ -9,22 +15,18 @@
"-Werror",
],
- include_dirs: [
- "frameworks/native/include/media/hardware",
- ],
-
- export_include_dirs: [
- "include",
- ],
-
header_libs: [
+ "libcodec2_headers",
"libhardware_headers",
"libutils_headers",
+ "media_plugin_headers",
],
export_header_lib_headers: [
+ "libcodec2_headers",
"libhardware_headers",
"libutils_headers",
+ "media_plugin_headers",
],
sanitize: {
@@ -40,3 +42,4 @@
ldflags: ["-Wl,-Bsymbolic"],
}
+
diff --git a/media/codec2/C2.cpp b/media/codec2/core/C2.cpp
similarity index 100%
rename from media/codec2/C2.cpp
rename to media/codec2/core/C2.cpp
diff --git a/media/codec2/include/C2.h b/media/codec2/core/include/C2.h
similarity index 100%
rename from media/codec2/include/C2.h
rename to media/codec2/core/include/C2.h
diff --git a/media/codec2/include/C2Buffer.h b/media/codec2/core/include/C2Buffer.h
similarity index 100%
rename from media/codec2/include/C2Buffer.h
rename to media/codec2/core/include/C2Buffer.h
diff --git a/media/codec2/include/C2BufferBase.h b/media/codec2/core/include/C2BufferBase.h
similarity index 100%
rename from media/codec2/include/C2BufferBase.h
rename to media/codec2/core/include/C2BufferBase.h
diff --git a/media/codec2/include/C2Component.h b/media/codec2/core/include/C2Component.h
similarity index 100%
rename from media/codec2/include/C2Component.h
rename to media/codec2/core/include/C2Component.h
diff --git a/media/codec2/include/C2Config.h b/media/codec2/core/include/C2Config.h
similarity index 100%
rename from media/codec2/include/C2Config.h
rename to media/codec2/core/include/C2Config.h
diff --git a/media/codec2/include/C2Enum.h b/media/codec2/core/include/C2Enum.h
similarity index 100%
rename from media/codec2/include/C2Enum.h
rename to media/codec2/core/include/C2Enum.h
diff --git a/media/codec2/include/C2Param.h b/media/codec2/core/include/C2Param.h
similarity index 100%
rename from media/codec2/include/C2Param.h
rename to media/codec2/core/include/C2Param.h
diff --git a/media/codec2/include/C2ParamDef.h b/media/codec2/core/include/C2ParamDef.h
similarity index 100%
rename from media/codec2/include/C2ParamDef.h
rename to media/codec2/core/include/C2ParamDef.h
diff --git a/media/codec2/include/C2Work.h b/media/codec2/core/include/C2Work.h
similarity index 100%
rename from media/codec2/include/C2Work.h
rename to media/codec2/core/include/C2Work.h
diff --git a/media/codec2/include/_C2MacroUtils.h b/media/codec2/core/include/_C2MacroUtils.h
similarity index 100%
rename from media/codec2/include/_C2MacroUtils.h
rename to media/codec2/core/include/_C2MacroUtils.h
diff --git a/media/codec2/include/android-C2Buffer.h b/media/codec2/core/include/android-C2Buffer.h
similarity index 100%
rename from media/codec2/include/android-C2Buffer.h
rename to media/codec2/core/include/android-C2Buffer.h
diff --git a/media/codec2/include/media/stagefright/codec2/1.0/InputSurface.h b/media/codec2/core/include/media/stagefright/codec2/1.0/InputSurface.h
similarity index 100%
rename from media/codec2/include/media/stagefright/codec2/1.0/InputSurface.h
rename to media/codec2/core/include/media/stagefright/codec2/1.0/InputSurface.h
diff --git a/media/codec2/include/media/stagefright/codec2/1.0/InputSurfaceConnection.h b/media/codec2/core/include/media/stagefright/codec2/1.0/InputSurfaceConnection.h
similarity index 100%
rename from media/codec2/include/media/stagefright/codec2/1.0/InputSurfaceConnection.h
rename to media/codec2/core/include/media/stagefright/codec2/1.0/InputSurfaceConnection.h
diff --git a/media/codec2/tests/Android.bp b/media/codec2/tests/Android.bp
index 5540f7b..fce6e21 100644
--- a/media/codec2/tests/Android.bp
+++ b/media/codec2/tests/Android.bp
@@ -6,10 +6,13 @@
],
include_dirs: [
- "frameworks/av/media/codec2/include",
"frameworks/av/media/codec2/vndk/include",
],
+ header_libs: [
+ "libcodec2_headers",
+ ],
+
// param tests must not depend on any codec2 libraries as all params should be templated
shared_libs: [
],
@@ -57,8 +60,8 @@
"C2ComponentInterface_test.cpp",
],
- include_dirs: [
- "frameworks/native/include/media/openmax",
+ header_libs: [
+ "media_plugin_headers",
],
shared_libs: [
diff --git a/media/codec2/vndk/Android.bp b/media/codec2/vndk/Android.bp
index 5a7c98c..0eb90be 100644
--- a/media/codec2/vndk/Android.bp
+++ b/media/codec2/vndk/Android.bp
@@ -42,9 +42,9 @@
"internal",
],
- include_dirs: [
- "frameworks/native/include/media/hardware",
- "frameworks/av/media/codec2/include",
+ header_libs: [
+ "media_plugin_headers",
+ "libcodec2_headers",
],
shared_libs: [