Rename Codec2-related entities
Test: Builds
Bug: 112362730
Change-Id: I5d4c962f9ebacb7c71a5dc9db927484d7435dc57
diff --git a/media/codec2/components/base/Android.bp b/media/codec2/components/base/Android.bp
index ad456e2..06bb81a 100644
--- a/media/codec2/components/base/Android.bp
+++ b/media/codec2/components/base/Android.bp
@@ -1,8 +1,8 @@
// DO NOT DEPEND ON THIS DIRECTLY
-// use libstagefright_soft_c2-defaults instead
+// use libcodec2_soft-defaults instead
cc_library_shared {
- name: "libstagefright_soft_c2common",
- defaults: ["libstagefright_codec2-impl-defaults"],
+ name: "libcodec2_soft_common",
+ defaults: ["libcodec2-impl-defaults"],
vendor_available: true,
srcs: [
@@ -15,13 +15,13 @@
],
export_shared_lib_headers: [
- "libstagefright_ccodec_utils",
+ "libsfplugin_ccodec_utils",
],
shared_libs: [
"libcutils", // for properties
"liblog", // for ALOG
- "libstagefright_ccodec_utils", // for ImageCopy
+ "libsfplugin_ccodec_utils", // for ImageCopy
"libstagefright_foundation", // for Mutexed
],
@@ -42,20 +42,20 @@
// public dependency for software codec implementation
// to be used by code under media/codecs/* only as its stability is not guaranteed
cc_defaults {
- name: "libstagefright_soft_c2-defaults",
- defaults: ["libstagefright_codec2-impl-defaults"],
+ name: "libcodec2_soft-defaults",
+ defaults: ["libcodec2-impl-defaults"],
vendor_available: true,
export_shared_lib_headers: [
- "libstagefright_ccodec_utils",
+ "libsfplugin_ccodec_utils",
],
shared_libs: [
+ "libcodec2_soft_common",
"libcutils", // for properties
"liblog", // for ALOG
+ "libsfplugin_ccodec_utils", // for ImageCopy
"libstagefright_foundation", // for ColorUtils and MIME
- "libstagefright_ccodec_utils", // for ImageCopy
- "libstagefright_soft_c2common",
],
cflags: [
@@ -69,7 +69,7 @@
// public dependency for software codec implementation
// to be used by code under media/codecs/* only
cc_defaults {
- name: "libstagefright_soft_c2_sanitize_all-defaults",
+ name: "libcodec2_soft_sanitize_all-defaults",
sanitize: {
misc_undefined: [
@@ -86,7 +86,7 @@
// public dependency for software codec implementation
// to be used by code under media/codecs/* only
cc_defaults {
- name: "libstagefright_soft_c2_sanitize_signed-defaults",
+ name: "libcodec2_soft_sanitize_signed-defaults",
sanitize: {
misc_undefined: [
@@ -101,7 +101,7 @@
// TEMP: used by cheets2 project - remove when no longer used
cc_library_shared {
- name: "libstagefright_simple_c2component",
+ name: "libcodec2_simple_component",
vendor_available: true,
srcs: [
@@ -117,10 +117,10 @@
],
shared_libs: [
+ "libcodec2",
+ "libcodec2_vndk",
"libcutils",
"liblog",
- "libstagefright_codec2",
- "libstagefright_codec2_vndk",
"libstagefright_foundation",
"libutils",
],