Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9c14d9e authored by Dan Albert's avatar Dan Albert Committed by android-build-merger
Browse files

Merge "Migrate libEGL to ndk_library." am: ce1bc304 am: 183edbb0 am: 62d80401 

am: 2fa713c8

Change-Id: If5341614d2beda92ed4cc7e006dd0846be3c4122
parents 1a3e3e23 2fa713c8

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -8,6 +8,6 @@ ndk_headers { 
subdirs = [

    "cmds/*",

    "libs/*",

    "opengl/*",

    "opengl",

    "services/*",

]

opengl/Android.bp

0 → 100644
+24 −0
Original line number Diff line number Diff line 
// Copyright (C) 2016 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.



ndk_headers {

    name: "libEGL_headers",

    from: "include",

    to: "",

    srcs: ["include/EGL/**/*.h"],

}



subdirs = [

    "*",

]

opengl/libs/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -20,3 +20,10 @@ cc_library { 
        },

    },

}



// The headers module is in frameworks/native/opengl/Android.bp.

ndk_library {

    name: "libEGL.ndk",

    symbol_file: "libEGL.map.txt",

    first_version: "9",

}

opengl/libs/libEGL.map.txt

0 → 100644
+67 −0
Original line number Diff line number Diff line 
LIBEGL {

  global:

    eglBindAPI;

    eglBindTexImage;

    eglChooseConfig;

    eglClientWaitSyncKHR; # introduced-arm=18 introduced-arm64=21 introduced-mips=18 introduced-mips64=21 introduced-x86=18 introduced-x86_64=21

    eglCopyBuffers;

    eglCreateContext;

    eglCreateImageKHR;

    eglCreateNativeClientBufferANDROID; # introduced=24

    eglCreatePbufferFromClientBuffer;

    eglCreatePbufferSurface;

    eglCreatePixmapSurface;

    eglCreateStreamFromFileDescriptorKHR; # introduced=23

    eglCreateStreamKHR; # introduced=23

    eglCreateStreamProducerSurfaceKHR; # introduced=23

    eglCreateSyncKHR; # introduced-arm=18 introduced-arm64=21 introduced-mips=18 introduced-mips64=21 introduced-x86=18 introduced-x86_64=21

    eglCreateWindowSurface;

    eglDestroyContext;

    eglDestroyImageKHR;

    eglDestroyStreamKHR; # introduced=23

    eglDestroySurface;

    eglDestroySyncKHR; # introduced-arm=18 introduced-arm64=21 introduced-mips=18 introduced-mips64=21 introduced-x86=18 introduced-x86_64=21

    eglGetConfigAttrib;

    eglGetConfigs;

    eglGetCurrentContext;

    eglGetCurrentDisplay;

    eglGetCurrentSurface;

    eglGetDisplay;

    eglGetError;

    eglGetProcAddress;

    eglGetStreamFileDescriptorKHR; # introduced=23

    eglGetSyncAttribKHR; # introduced-arm=18 introduced-arm64=21 introduced-mips=18 introduced-mips64=21 introduced-x86=18 introduced-x86_64=21

    eglGetSystemTimeFrequencyNV; # introduced-arm=14 introduced-arm64=21 introduced-mips=14 introduced-mips64=21 introduced-x86=14 introduced-x86_64=21

    eglGetSystemTimeNV; # introduced-arm=14 introduced-arm64=21 introduced-mips=14 introduced-mips64=21 introduced-x86=14 introduced-x86_64=21

    eglInitialize;

    eglLockSurfaceKHR;

    eglMakeCurrent;

    eglPresentationTimeANDROID; # introduced-arm=18 introduced-arm64=21 introduced-mips=18 introduced-mips64=21 introduced-x86=18 introduced-x86_64=21

    eglQueryAPI;

    eglQueryContext;

    eglQueryStreamKHR; # introduced=23

    eglQueryStreamTimeKHR; # introduced=23

    eglQueryStreamu64KHR; # introduced=23

    eglQueryString;

    eglQuerySurface;

    eglReleaseTexImage;

    eglReleaseThread;

    eglSetDamageRegionKHR; # introduced=23

    eglSignalSyncKHR; # introduced-arm=18 introduced-arm64=21 introduced-mips=18 introduced-mips64=21 introduced-x86=18 introduced-x86_64=21

    eglStreamAttribKHR; # introduced=23

    eglStreamConsumerAcquireKHR; # introduced=23

    eglStreamConsumerGLTextureExternalKHR; # introduced=23

    eglStreamConsumerReleaseKHR; # introduced=23

    eglSurfaceAttrib;

    eglSwapBuffers;

    eglSwapBuffersWithDamageKHR; # introduced=23

    eglSwapInterval;

    eglTerminate;

    eglUnlockSurfaceKHR;

    eglWaitClient;

    eglWaitGL;

    eglWaitNative;

    eglWaitSyncKHR; # introduced-arm=18 introduced-arm64=21 introduced-mips=18 introduced-mips64=21 introduced-x86=18 introduced-x86_64=21

  local:

    *;

};