diff options
| author | TreeHugger Robot | 2017-08-15 05:16:18 -0500 |
|---|---|---|
| committer | Android (Google) Code Review | 2017-08-15 05:16:18 -0500 |
| commit | d2bc3ac8c4d7e71975a8c99762b63307a5e6e449 (patch) | |
| tree | dfa19617db99b5b7210ba57f803411193f1e4c0b /services/surfaceflinger | |
| parent | 9afe0a990cdf1433e14340c8f5ba6b4ddd94ef60 (diff) | |
| parent | 00b15b8f223976d016e16536e4720771ef634695 (diff) | |
| download | frameworks-native-d2bc3ac8c4d7e71975a8c99762b63307a5e6e449.tar.gz frameworks-native-d2bc3ac8c4d7e71975a8c99762b63307a5e6e449.tar.xz frameworks-native-d2bc3ac8c4d7e71975a8c99762b63307a5e6e449.zip | |
Merge "Mark libEGL, GLESv1_CM, GLESv2, and GLESv3 as LLNDK" into oc-mr1-dev
Diffstat (limited to 'services/surfaceflinger')
| -rw-r--r-- | services/surfaceflinger/RenderEngine/RenderEngine.cpp | 2 | ||||
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 2 | ||||
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger_hwc1.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/services/surfaceflinger/RenderEngine/RenderEngine.cpp b/services/surfaceflinger/RenderEngine/RenderEngine.cpp index 57f468d2f..56e9ac07a 100644 --- a/services/surfaceflinger/RenderEngine/RenderEngine.cpp +++ b/services/surfaceflinger/RenderEngine/RenderEngine.cpp | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | #include <vector> | 26 | #include <vector> |
| 27 | #include <SurfaceFlinger.h> | 27 | #include <SurfaceFlinger.h> |
| 28 | 28 | ||
| 29 | EGLAPI const char* eglQueryStringImplementationANDROID(EGLDisplay dpy, EGLint name); | 29 | extern "C" EGLAPI const char* eglQueryStringImplementationANDROID(EGLDisplay dpy, EGLint name); |
| 30 | 30 | ||
| 31 | // --------------------------------------------------------------------------- | 31 | // --------------------------------------------------------------------------- |
| 32 | namespace android { | 32 | namespace android { |
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 06e2a7fd3..4aaa8c0b2 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp | |||
| @@ -97,7 +97,7 @@ | |||
| 97 | */ | 97 | */ |
| 98 | #define DEBUG_SCREENSHOTS false | 98 | #define DEBUG_SCREENSHOTS false |
| 99 | 99 | ||
| 100 | EGLAPI const char* eglQueryStringImplementationANDROID(EGLDisplay dpy, EGLint name); | 100 | extern "C" EGLAPI const char* eglQueryStringImplementationANDROID(EGLDisplay dpy, EGLint name); |
| 101 | 101 | ||
| 102 | namespace android { | 102 | namespace android { |
| 103 | 103 | ||
diff --git a/services/surfaceflinger/SurfaceFlinger_hwc1.cpp b/services/surfaceflinger/SurfaceFlinger_hwc1.cpp index a41d35f19..e5bb228df 100644 --- a/services/surfaceflinger/SurfaceFlinger_hwc1.cpp +++ b/services/surfaceflinger/SurfaceFlinger_hwc1.cpp | |||
| @@ -94,7 +94,7 @@ | |||
| 94 | */ | 94 | */ |
| 95 | #define DEBUG_SCREENSHOTS false | 95 | #define DEBUG_SCREENSHOTS false |
| 96 | 96 | ||
| 97 | EGLAPI const char* eglQueryStringImplementationANDROID(EGLDisplay dpy, EGLint name); | 97 | extern "C" EGLAPI const char* eglQueryStringImplementationANDROID(EGLDisplay dpy, EGLint name); |
| 98 | 98 | ||
| 99 | namespace android { | 99 | namespace android { |
| 100 | // --------------------------------------------------------------------------- | 100 | // --------------------------------------------------------------------------- |