diff options
| author | Yifan Hong <elsk@google.com> | 2017-06-09 22:19:24 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-09 22:19:24 +0000 |
| commit | 0cff5950f532ef4116a4e5559d54eecaf4743e49 (patch) | |
| tree | 095e2d6c09f59a37afa35f9097d9e89ea36dbd84 | |
| parent | 8117f8d7328bc3d2d6b46c87a5c5a847e9acb420 (diff) | |
| parent | f77d5a53a0f6dfad9c9aa8d3c30333e901865c3b (diff) | |
| download | device_generic_goldfish-opengl-0cff5950f532ef4116a4e5559d54eecaf4743e49.tar.gz device_generic_goldfish-opengl-0cff5950f532ef4116a4e5559d54eecaf4743e49.tar.bz2 device_generic_goldfish-opengl-0cff5950f532ef4116a4e5559d54eecaf4743e49.zip | |
Resolve emulator opengl dependencies. am: 8527011e4c
am: f77d5a53a0
Change-Id: Icf7191d2094d3f08d60cf4773e2556bc513e8647
| -rw-r--r-- | system/OpenglSystemCommon/Android.mk | 5 | ||||
| -rw-r--r-- | system/egl/Android.mk | 5 | ||||
| -rw-r--r-- | system/egl/goldfish_sync.h | 4 |
3 files changed, 14 insertions, 0 deletions
diff --git a/system/OpenglSystemCommon/Android.mk b/system/OpenglSystemCommon/Android.mk index 71d851f6..93051195 100644 --- a/system/OpenglSystemCommon/Android.mk +++ b/system/OpenglSystemCommon/Android.mk @@ -17,6 +17,11 @@ LOCAL_HEADER_LIBRARIES += libnativebase_headers $(call emugl-export,HEADER_LIBRARIES,libnativebase_headers) endif +ifdef IS_AT_LEAST_OPD1 +LOCAL_HEADER_LIBRARIES += libhardware_headers +$(call emugl-export,HEADER_LIBRARIES,libhardware_headers) +endif + $(call emugl-export,C_INCLUDES,$(LOCAL_PATH) bionic/libc/private) $(call emugl-end-module) diff --git a/system/egl/Android.mk b/system/egl/Android.mk index 0c7317a7..2d7a5595 100644 --- a/system/egl/Android.mk +++ b/system/egl/Android.mk @@ -19,6 +19,11 @@ else LOCAL_SHARED_LIBRARIES += libdl endif +ifdef IS_AT_LEAST_OPD1 +LOCAL_SHARED_LIBRARIES += libui +LOCAL_HEADER_LIBRARIES += libnativebase_headers +endif + # Used to access the Bionic private OpenGL TLS slot LOCAL_C_INCLUDES += bionic/libc/private diff --git a/system/egl/goldfish_sync.h b/system/egl/goldfish_sync.h index 4667a776..6b30fe5b 100644 --- a/system/egl/goldfish_sync.h +++ b/system/egl/goldfish_sync.h @@ -18,6 +18,10 @@ #include <linux/ioctl.h> #include <linux/types.h> #include <sys/cdefs.h> +#ifdef EMULATOR_OPENGL_POST_O +#include <sys/ioctl.h> +#include <sys/unistd.h> +#endif #include <fcntl.h> // Make it conflict with ioctls that are not likely to be used |