Rename Codec2-related entities
Test: Builds
Bug: 112362730
Change-Id: I5d4c962f9ebacb7c71a5dc9db927484d7435dc57
diff --git a/media/codec2/sfplugin/Android.bp b/media/codec2/sfplugin/Android.bp
index 831fb35..f5578726 100644
--- a/media/codec2/sfplugin/Android.bp
+++ b/media/codec2/sfplugin/Android.bp
@@ -1,5 +1,5 @@
cc_library_shared {
- name: "libstagefright_ccodec",
+ name: "libsfplugin_ccodec",
srcs: [
"C2OMXNode.cpp",
@@ -18,17 +18,19 @@
],
header_libs: [
- "libstagefright_codec2_internal",
+ "libcodec2_internal",
],
shared_libs: [
"android.hardware.cas.native@1.0",
"android.hardware.graphics.bufferqueue@1.0",
+ "android.hardware.media.c2@1.0",
"android.hardware.media.omx@1.0",
- "hardware.google.media.c2@1.0",
"libbase",
"libbinder",
- "libcodec2_hidl_client",
+ "libcodec2",
+ "libcodec2_client",
+ "libcodec2_vndk",
"libcutils",
"libgui",
"libhidlallocatorutils",
@@ -36,10 +38,8 @@
"liblog",
"libmedia",
"libmedia_omx",
+ "libsfplugin_ccodec_utils",
"libstagefright_bufferqueue_helper",
- "libstagefright_ccodec_utils",
- "libstagefright_codec2",
- "libstagefright_codec2_vndk",
"libstagefright_codecbase",
"libstagefright_foundation",
"libstagefright_omx_utils",
diff --git a/media/codec2/sfplugin/CCodec.cpp b/media/codec2/sfplugin/CCodec.cpp
index f00c62e..f903bbb 100644
--- a/media/codec2/sfplugin/CCodec.cpp
+++ b/media/codec2/sfplugin/CCodec.cpp
@@ -55,7 +55,7 @@
using ::android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer;
using android::base::StringPrintf;
using BGraphicBufferSource = ::android::IGraphicBufferSource;
-using ::hardware::google::media::c2::V1_0::IInputSurface;
+using ::android::hardware::media::c2::V1_0::IInputSurface;
namespace {
diff --git a/media/codec2/sfplugin/tests/Android.bp b/media/codec2/sfplugin/tests/Android.bp
index b08d3d6..be7f55c 100644
--- a/media/codec2/sfplugin/tests/Android.bp
+++ b/media/codec2/sfplugin/tests/Android.bp
@@ -1,17 +1,17 @@
cc_test {
- name: "ccodec_test",
+ name: "ccodec_unit_test",
srcs: [
"ReflectedParamUpdater_test.cpp",
],
include_dirs: [
- "hardware/google/av/media/sfplugin",
+ "frameworks/av/media/codec2/sfplugin",
],
shared_libs: [
- "libstagefright_ccodec",
- "libstagefright_codec2",
+ "libcodec2",
+ "libsfplugin_ccodec",
"libstagefright_foundation",
"libutils",
],
@@ -23,24 +23,24 @@
}
cc_test {
- name: "mc_sanity",
+ name: "mc_sanity_test",
srcs: [
"MediaCodec_sanity_test.cpp",
],
include_dirs: [
- "hardware/google/av/media/sfplugin",
+ "frameworks/av/media/codec2/sfplugin",
],
shared_libs: [
"libbinder",
+ "libcodec2",
"libgui",
"libmedia",
"libmedia_omx",
+ "libsfplugin_ccodec",
"libstagefright",
- "libstagefright_ccodec",
- "libstagefright_codec2",
"libstagefright_foundation",
"libutils",
],
diff --git a/media/codec2/sfplugin/utils/Android.bp b/media/codec2/sfplugin/utils/Android.bp
index 3dc6060..bd4983c 100644
--- a/media/codec2/sfplugin/utils/Android.bp
+++ b/media/codec2/sfplugin/utils/Android.bp
@@ -1,5 +1,5 @@
cc_library_shared {
- name: "libstagefright_ccodec_utils",
+ name: "libsfplugin_ccodec_utils",
vendor_available: true,
srcs: [
@@ -18,10 +18,10 @@
shared_libs: [
"libbase",
+ "libcodec2",
+ "libcodec2_vndk",
"libcutils",
"liblog",
- "libstagefright_codec2",
- "libstagefright_codec2_vndk",
"libstagefright_foundation",
"libutils",
],