Break a dependency of libui on libandroid
This was only a header dependency, but it still
created a circular dependency, which will cause
problems in another CL.
We fix this by creating a libarect static library
containing only that header. both libui and
libandroid now depend on it and reexport the
header.
We also make sure rect.h ends-up in the right
place.
Test: built and booted device
Bug: 35164655
Change-Id: Iba25b8b801b26b26ec1401c00caf367a06f197ca
diff --git a/libs/vr/libbufferhub/include/private/dvr/native_buffer.h b/libs/vr/libbufferhub/include/private/dvr/native_buffer.h
index afed052..f9b6975 100644
--- a/libs/vr/libbufferhub/include/private/dvr/native_buffer.h
+++ b/libs/vr/libbufferhub/include/private/dvr/native_buffer.h
@@ -3,7 +3,6 @@
#include <EGL/egl.h>
#include <EGL/eglext.h>
-#include <android/native_window.h>
#include <log/log.h>
#include <system/window.h>
#include <ui/ANativeObjectBase.h>
diff --git a/libs/vr/libeds/Android.mk b/libs/vr/libeds/Android.mk
index 373e68e..fd2c56e 100644
--- a/libs/vr/libeds/Android.mk
+++ b/libs/vr/libeds/Android.mk
@@ -36,7 +36,8 @@
libEGL \
libGLESv1_CM \
libGLESv2 \
- libvulkan
+ libvulkan \
+ libandroid
staticLibraries := \
libdisplay \
diff --git a/libs/vr/libsensor/Android.mk b/libs/vr/libsensor/Android.mk
index 8c7ad43..89abcb0 100644
--- a/libs/vr/libsensor/Android.mk
+++ b/libs/vr/libsensor/Android.mk
@@ -32,6 +32,7 @@
libhardware \
liblog \
libutils \
+ libandroid \
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(sourceFiles)