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

Commit c1f905d1 authored by Dan Albert's avatar Dan Albert Committed by Automerger Merge Worker
Browse files

Merge "Revert^2 "Skip C-verification of GL headers."" into main am: aa61e928 

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



Change-Id: I91626c83e0c0ac0e8dc746ef02494c126adaf53c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ed53d61c aa61e928

libs/binder/ndk/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -255,6 +255,9 @@ 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

+12 −0
Original line number Diff line number Diff line
@@ -30,6 +30,10 @@ 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 {
@@ -38,6 +42,10 @@ 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 {
@@ -46,6 +54,10 @@ 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 {