diff options
| author | Jiyong Park <jiyong@google.com> | 2017-09-01 11:27:51 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2017-09-01 11:31:55 +0900 |
| commit | 4dd4ecca7bcf1c9791b6c650ba4c6d143bea8276 (patch) | |
| tree | 0522aae9fb1c25669576ab6e9174b7c2268efc17 | |
| parent | fdde1933ac85aa3c1c5d32f53cf302526af1a907 (diff) | |
| download | device_generic_goldfish-opengl-4dd4ecca7bcf1c9791b6c650ba4c6d143bea8276.tar.gz device_generic_goldfish-opengl-4dd4ecca7bcf1c9791b6c650ba4c6d143bea8276.tar.bz2 device_generic_goldfish-opengl-4dd4ecca7bcf1c9791b6c650ba4c6d143bea8276.zip | |
Fix build error on pre O-MR1 devicesoreo-mr1-dev
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
| -rw-r--r-- | system/egl/Android.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/system/egl/Android.mk b/system/egl/Android.mk index e525e649..9864e131 100644 --- a/system/egl/Android.mk +++ b/system/egl/Android.mk @@ -19,9 +19,13 @@ 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 |