commit 482f60ccccc12e6afe24f9ba503496ce65d1ba43
author Chong Zhang <chz@google.com> Thu Mar 21 16:41:28 2019 -0700
committer Chong Zhang <chz@google.com> Fri Apr 05 18:12:10 2019 +0000
tree 90e04135449e80434f0b399d0e33d91bfce1de20
parent 6e38e1a2b74bd2ed304080b1dca1f77b1053dada

Remove direct libgui reference from omx server side

- Make mediacodec service/libstagefright_omx not dependent
on libgui. Server should only reference bqhelper (which
currently still have a dependency on libgui, but could be
removed later as it's only used internally).

- Make libmedia_omx not dependent on libgui by moving the
IOMX wrapper code into a separately that's only used by
the platform.

- Move ConsumerListener references in GraphicBufferSource
to implementation only, so that other libs including
GraphicBufferSource doesn't need to link libgui.

- Remove bqhelper references from some client side libs.

- Remove IOMX ipc related code, as IOMX interface is no
longer used for ipc. It's only used as an interface on
client side.

bug: 129272021
test: builds;
atest CtsMediaTestCases -- --module-arg CtsMediaTestCases:size:small

Change-Id: I49d80bf72eba325ee80b223d4a5ba7b0c1ab4d35

media/libmedia/Android.bp

diff --git a/media/libmedia/Android.bp b/media/libmedia/Android.bp
index a529628..1d33590 100644
--- a/media/libmedia/Android.bp
+++ b/media/libmedia/Android.bp
@@ -65,7 +65,6 @@
         "MediaCodecInfo.cpp",
         "OMXBuffer.cpp",
         "omx/1.0/WGraphicBufferSource.cpp",
-        "omx/1.0/WOmx.cpp",
         "omx/1.0/WOmxBufferSource.cpp",
         "omx/1.0/WOmxNode.cpp",
         "omx/1.0/WOmxObserver.cpp",
@@ -75,13 +74,16 @@
         local_include_dirs: ["aidl"],
         export_aidl_headers: true,
     },
+    
+    local_include_dirs: [
+        "include",
+    ],
 
     shared_libs: [
         "android.hidl.token@1.0-utils",
         "android.hardware.media.omx@1.0",
         "libbinder",
         "libcutils",
-        "libgui",
         "libhidlbase",
         "libhidltransport",
         "liblog",
@@ -93,21 +95,84 @@
     export_shared_lib_headers: [
         "android.hidl.token@1.0-utils",
         "android.hardware.media.omx@1.0",
-        "libgui",
         "libstagefright_foundation",
         "libui",
     ],
 
     header_libs: [
-        "libmedia_headers",
+        "libstagefright_headers",
+        "media_plugin_headers",
     ],
 
     export_header_lib_headers: [
-        "libmedia_headers",
+        "libstagefright_headers",
+        "media_plugin_headers",
     ],
 
     export_include_dirs: [
         "aidl",
+        "include",
+    ],
+
+    cflags: [
+        "-Werror",
+        "-Wno-error=deprecated-declarations",
+        "-Wall",
+    ],
+
+    sanitize: {
+        misc_undefined: [
+            "unsigned-integer-overflow",
+            "signed-integer-overflow",
+        ],
+        cfi: true,
+    },
+}
+
+
+cc_library_shared {
+    name: "libmedia_omx_client",
+
+    srcs: [
+        "omx/1.0/WOmx.cpp",
+    ],
+
+    local_include_dirs: [
+        "include",
+    ],
+
+    shared_libs: [
+        "libbinder",
+        "libcutils",
+        "libgui",
+        "libhidlbase",
+        "libhidltransport",
+        "liblog",
+        "libmedia_omx",
+        "libstagefright_foundation",
+        "libui",
+        "libutils",
+    ],
+
+    export_shared_lib_headers: [
+        "libgui",
+        "libmedia_omx",
+        "libstagefright_foundation",
+        "libui",
+    ],
+
+    header_libs: [
+        "libstagefright_headers",
+        "media_plugin_headers",
+    ],
+
+    export_header_lib_headers: [
+        "libstagefright_headers",
+        "media_plugin_headers",
+    ],
+
+    export_include_dirs: [
+        "include",
     ],
 
     cflags: [