Merge changes from topic "fix-omx-dependencies"

* changes:
  libgui: export EGL headers.
  Make libgui available to vendors
  Headers of libui is moved to the local directory
  Mark EGL/GLES libs as vendor_available

1 files changed, 16 insertions, 0 deletions

diff --git a/libs/gui/Android.bp b/libs/gui/Android.bp
index f1d1346366..e06cb5ffa0 100644
--- a/libs/gui/Android.bp
+++ b/libs/gui/Android.bp
@@ -11,9 +11,15 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+cc_library_headers {
+    name: "libgui_headers",
+    vendor_available: true,
+    export_include_dirs: ["include"],
+}
 
 cc_library_shared {
     name: "libgui",
+    vendor_available: true,
 
     clang: true,
     cppflags: [
@@ -117,13 +123,23 @@ cc_library_shared {
         "android.hardware.configstore-utils",
     ],
 
+    header_libs: [
+        "libgui_headers",
+    ],
+
     export_shared_lib_headers: [
         "libbinder",
+        "libEGL",
+        "libnativewindow",
         "libui",
         "android.hidl.token@1.0-utils",
         "android.hardware.graphics.bufferqueue@1.0",
     ],
 
+    export_header_lib_headers: [
+        "libgui_headers",
+    ],
+
     export_include_dirs: [
         "include",
     ],