commit defb1b0b7e082621a10763d1bd7a4a01e280fdf0
author Mathias Agopian <mathias@google.com> Thu Apr 27 22:40:10 2017 -0700
committer Mathias Agopian <mathias@google.com> Tue May 09 15:41:27 2017 -0700
tree 4460bf2e95b801963d7222def3130a677b668333
parent f7e2da4ca19db264d47c96ae07152aef6bce5c30

fix circular dependency libnativewindow <-> libui

Bug: 37647680, 37648355
Test: compile, manual
Change-Id: I9cb8a1320d7c73299fb2b081a054eafb8ef086c8

media/libmedia/Android.bp

diff --git a/media/libmedia/Android.bp b/media/libmedia/Android.bp
index e9b99b4..4c292ed 100644
--- a/media/libmedia/Android.bp
+++ b/media/libmedia/Android.bp
@@ -14,7 +14,7 @@
         "-Wall",
     ],
     shared: {
-      shared_libs: ["libutils", "liblog"],
+      shared_libs: ["libutils", "liblog", "libgui"],
     },
     clang: true,
 }

media/libmedia/include/media/OMXBuffer.h

diff --git a/media/libmedia/include/media/OMXBuffer.h b/media/libmedia/include/media/OMXBuffer.h
index 6f79182..3e84858 100644
--- a/media/libmedia/include/media/OMXBuffer.h
+++ b/media/libmedia/include/media/OMXBuffer.h
@@ -19,7 +19,6 @@
 
 #include <cutils/native_handle.h>
 #include <media/IOMX.h>
-#include <system/window.h>
 #include <utils/StrongPointer.h>
 #include <hidl/HidlSupport.h>