commit 4dd4ecca7bcf1c9791b6c650ba4c6d143bea8276
author Jiyong Park <jiyong@google.com> Fri Sep 01 11:27:51 2017 +0900
committer Jiyong Park <jiyong@google.com> Fri Sep 01 11:31:55 2017 +0900
tree 0522aae9fb1c25669576ab6e9174b7c2268efc17
parent fdde1933ac85aa3c1c5d32f53cf302526af1a907

Fix build error on pre O-MR1 devices

libarect is available from O
libui_headers is available from O-MR1
Guard them properly.

Bug: 64704866
Test: Built aosp_x86 with "BOARD_VNDK_VERSION := current" and
      "BOARD_VNDK_RUNTIME_DISABLE := true". Booted on x86 emulator

Change-Id: Ic0aa2dbba5611d8a8fb1cb9ea0d8a66ad26c4794

system/egl/Android.mk

diff --git a/system/egl/Android.mk b/system/egl/Android.mk
index e525e64..9864e13 100644
--- a/system/egl/Android.mk
+++ b/system/egl/Android.mk
@@ -19,9 +19,13 @@
 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