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

Commit b19b1255 authored by Priyanka Advani (xWF)'s avatar Priyanka Advani (xWF) Committed by Automerger Merge Worker
Browse files

Merge "Revert "Skip C-verification of GL headers."" into main am: f9d7f291 am: 0d5d421a 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3214339



Change-Id: I37feb6bbdc8fef9aecbf03de7b18defb23af0151
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e7123c3b 0d5d421a

libs/binder/ndk/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -255,9 +255,6 @@ ndk_headers { 
        "include_cpp/android/*.h",

    ],

    license: "NOTICE",

    // These are intentionally not C. It's a mistake that they're in the NDK.

    // See the bug above.

    skip_verification: true,

}



ndk_library {

opengl/Android.bp

+0 −12
Original line number Diff line number Diff line
@@ -30,10 +30,6 @@ ndk_headers { 
    to: "",

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

    license: "include/EGL/NOTICE",

    // eglext.h is not self-contained. Safe to skip C-compat verification

    // though since upstream also cares about C compatibility, and the header is

    // auto-generated anyway.

    skip_verification: true,

}



ndk_headers {
@@ -42,10 +38,6 @@ ndk_headers { 
    to: "",

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

    license: "include/GLES/NOTICE",

    // glext.h is not self-contained. Safe to skip C-compat verification

    // though since upstream also cares about C compatibility, and the header is

    // auto-generated anyway.

    skip_verification: true,

}



ndk_headers {
@@ -54,10 +46,6 @@ ndk_headers { 
    to: "",

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

    license: "include/GLES2/NOTICE",

    // gl2ext.h is not self-contained. Safe to skip C-compat verification

    // though since upstream also cares about C compatibility, and the header is

    // auto-generated anyway.

    skip_verification: true,

}



ndk_headers {