commit d0f0e14d0e4e70b4db97752a33bc9bd2e931cd54
author Pawin Vongmasa <pawin@google.com> Thu Nov 15 03:36:28 2018 -0800
committer Pawin Vongmasa <pawin@google.com> Fri Nov 16 03:50:36 2018 -0800
tree 3dbb86b7b73999713cefa4da318d69287eb6132b
parent 3665390c9d32a917398b240c5a46ced07a3b65eb

Rename Codec2-related entities

Test: Builds

Bug: 112362730

Change-Id: I5d4c962f9ebacb7c71a5dc9db927484d7435dc57

media/codec2/vndk/Android.bp

diff --git a/media/codec2/vndk/Android.bp b/media/codec2/vndk/Android.bp
index cabe7ee..5a7c98c 100644
--- a/media/codec2/vndk/Android.bp
+++ b/media/codec2/vndk/Android.bp
@@ -1,5 +1,5 @@
 cc_library_headers {
-    name: "libstagefright_codec2_internal",
+    name: "libcodec2_internal",
 
     export_include_dirs: [
         "internal",
@@ -10,9 +10,9 @@
 }
 
 // !!!DO NOT DEPEND ON THIS SHARED LIBRARY DIRECTLY!!!
-// use libstagefright_codec2-impl-defaults instead
+// use libcodec2-impl-defaults instead
 cc_library_shared {
-    name: "libstagefright_codec2_vndk",
+    name: "libcodec2_vndk",
     vendor_available: true,
 
     srcs: [
@@ -44,7 +44,7 @@
 
     include_dirs: [
         "frameworks/native/include/media/hardware",
-        "hardware/google/av/codec2/include",
+        "frameworks/av/media/codec2/include",
     ],
 
     shared_libs: [
@@ -76,13 +76,13 @@
 
 // public dependency for implementing Codec 2 components
 cc_defaults {
-    name: "libstagefright_codec2-impl-defaults",
+    name: "libcodec2-impl-defaults",
 
     shared_libs: [
         "libbase", // for C2_LOG
         "liblog", // for ALOG
-        "libstagefright_codec2",
-        "libstagefright_codec2_vndk",
+        "libcodec2",
+        "libcodec2_vndk",
         "libutils",
     ],
 }
@@ -90,8 +90,8 @@
 // public dependency for implementing Codec 2 framework utilities
 // THIS IS ONLY FOR FRAMEWORK USE ONLY
 cc_defaults {
-    name: "libstagefright_codec2-internal-defaults",
-    defaults: ["libstagefright_codec2-impl-defaults"],
+    name: "libcodec2-internal-defaults",
+    defaults: ["libcodec2-impl-defaults"],
 
     shared_libs: [
         "libcutils", // for properties
@@ -100,6 +100,3 @@
     // TODO: separate internal headers so they can be exposed here
 }
 
-subdirs = [
-    "bufferpool",
-]