diff --git a/system/egl/Android.mk b/system/egl/Android.mk
index 5a8819a..9864e13 100644
--- a/system/egl/Android.mk
+++ b/system/egl/Android.mk
@@ -14,12 +14,20 @@
     ClientAPIExts.cpp
 
 ifdef IS_AT_LEAST_OPD1
-LOCAL_SHARED_LIBRARIES += libdl libnativewindow libui
+LOCAL_SHARED_LIBRARIES += libdl libnativewindow
 else
 LOCAL_SHARED_LIBRARIES += libdl
 endif
 
 ifdef IS_AT_LEAST_OPD1
+LOCAL_STATIC_LIBRARIES += libarect
+endif
+
+ifdef IS_AT_LEAST_OPM1
+LOCAL_HEADER_LIBRARIES += libui_headers
+endif
+
+ifdef IS_AT_LEAST_OPD1
 LOCAL_HEADER_LIBRARIES += libnativebase_headers
 endif