commit b4979c59d93a6ca2be7e65489fc39896bfdc2c96
author Sung-fang Tsai <sungfang@google.com> Sun Apr 07 00:29:22 2019 +0000
committer Victor Chang <vichang@google.com> Mon Apr 08 10:32:03 2019 +0000
tree 3da5a8d97ee8f37f4f480ad80104b6f77d3bcd87
parent 482f60ccccc12e6afe24f9ba503496ce65d1ba43

Revert "Remove direct libgui reference from omx server side"

This reverts commit 482f60ccccc12e6afe24f9ba503496ce65d1ba43.

Reason for revert: b/130058749 camera recording hang

Bug: 130058749
Change-Id: I358bc9c62c48328c01c8611c7e6f77d16affff54

media/libmedia/Android.bp

diff --git a/media/libmedia/Android.bp b/media/libmedia/Android.bp
index 1d33590..a529628 100644
--- a/media/libmedia/Android.bp
+++ b/media/libmedia/Android.bp
@@ -65,6 +65,7 @@
         "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",
@@ -74,16 +75,13 @@
         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",
@@ -95,84 +93,21 @@
     export_shared_lib_headers: [
         "android.hidl.token@1.0-utils",
         "android.hardware.media.omx@1.0",
+        "libgui",
         "libstagefright_foundation",
         "libui",
     ],
 
     header_libs: [
-        "libstagefright_headers",
-        "media_plugin_headers",
+        "libmedia_headers",
     ],
 
     export_header_lib_headers: [
-        "libstagefright_headers",
-        "media_plugin_headers",
+        "libmedia_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: [