commit 6a3c05bcfab588fd99dd8d619a53d15374e99507
author Mathias Agopian <mathias@google.com> Thu Apr 27 20:06:55 2017 -0700
committer Mathias Agopian <mathias@google.com> Tue May 09 16:42:31 2017 -0700
tree 30e5edaa74ea3dff07579a5a9cd39f1755069eb3
parent 37c27efdf8232272648e56513f3caceeb5c66407

fix circular dependency libnativewindow <-> libui

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

opengl/libagl/Android.mk

diff --git a/opengl/libagl/Android.mk b/opengl/libagl/Android.mk
index 4b08749..c7635e2 100644
--- a/opengl/libagl/Android.mk
+++ b/opengl/libagl/Android.mk
@@ -26,7 +26,7 @@
 LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
 LOCAL_CFLAGS += -fvisibility=hidden
 
-LOCAL_SHARED_LIBRARIES := libcutils libhardware libutils liblog libpixelflinger libETC1 libui
+LOCAL_SHARED_LIBRARIES := libcutils libhardware libutils liblog libpixelflinger libETC1 libui libnativewindow
 
 LOCAL_SRC_FILES_arm += fixed_asm.S iterators.S
 LOCAL_CFLAGS_arm += -fstrict-aliasing