diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-05-11 08:40:08 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-05-11 08:40:08 +0000 |
| commit | 86802bfd2532211c9a4696c0d6bd2828e56c6a49 (patch) | |
| tree | 83607f3de67886507920363403bba7515f68d446 | |
| parent | 0ea22ff2476527abb7b5ef75c4b5e1890275581e (diff) | |
| parent | 410e46c021f606ef99680ea6d7bac74656945ac0 (diff) | |
| download | goldfish-opengl-86802bfd2532211c9a4696c0d6bd2828e56c6a49.tar.gz | |
release-request-051da47e-713f-4e09-8f6c-698fb4d4e92e-for-git_oc-dr1-release-3997165 snap-temp-L04400000062809322
Change-Id: Id9ab6bc6b41c2ba68162f364ecb55956cd24f7af
| -rw-r--r-- | common.mk | 1 | ||||
| -rw-r--r-- | system/OpenglSystemCommon/Android.mk | 3 | ||||
| -rw-r--r-- | system/OpenglSystemCommon/EGLImage.h | 1 | ||||
| -rw-r--r-- | system/egl/Android.mk | 2 |
4 files changed, 6 insertions, 1 deletions
@@ -100,6 +100,7 @@ EMUGL_EXPORT_TYPES := \ C_INCLUDES \ SHARED_LIBRARIES \ STATIC_LIBRARIES \ + HEADER_LIBRARIES \ ADDITIONAL_DEPENDENCIES # Initialize a module in our database diff --git a/system/OpenglSystemCommon/Android.mk b/system/OpenglSystemCommon/Android.mk index 9853f29a..b39259c9 100644 --- a/system/OpenglSystemCommon/Android.mk +++ b/system/OpenglSystemCommon/Android.mk @@ -11,6 +11,9 @@ LOCAL_SRC_FILES := \ QemuPipeStream.cpp \ ThreadInfo.cpp +LOCAL_HEADER_LIBRARIES += libnativebase_headers + +$(call emugl-export,HEADER_LIBRARIES,libnativebase_headers) $(call emugl-export,C_INCLUDES,$(LOCAL_PATH) bionic/libc/private) $(call emugl-end-module) diff --git a/system/OpenglSystemCommon/EGLImage.h b/system/OpenglSystemCommon/EGLImage.h index 23ea28c4..a34b64c6 100644 --- a/system/OpenglSystemCommon/EGLImage.h +++ b/system/OpenglSystemCommon/EGLImage.h @@ -21,6 +21,7 @@ #include <GLES/gl.h> #if PLATFORM_SDK_VERSION >= 16 +#include <nativebase/nativebase.h> #include <cutils/native_handle.h> #else // PLATFORM_SDK_VERSION >= 16 #include <private/ui/android_natives_priv.h> diff --git a/system/egl/Android.mk b/system/egl/Android.mk index f7dcc70e..4c765c43 100644 --- a/system/egl/Android.mk +++ b/system/egl/Android.mk @@ -13,7 +13,7 @@ LOCAL_SRC_FILES := \ egl.cpp \ ClientAPIExts.cpp -LOCAL_SHARED_LIBRARIES += libdl +LOCAL_SHARED_LIBRARIES += libdl libnativewindow # Used to access the Bionic private OpenGL TLS slot LOCAL_C_INCLUDES += bionic/libc/private |