diff options
| author | 2024-08-14 23:04:55 +0000 | |
|---|---|---|
| committer | 2024-08-14 23:04:55 +0000 | |
| commit | 34f25e0828340ca2cb69560f402bccd087ee40bb (patch) | |
| tree | b76ec40674493c9c8819009b4b2e54bc69bf1c74 | |
| parent | 3610fce8faeb98989aeff98c4f359bce19051a1c (diff) | |
| parent | c1f905d1fd838a4680f525cd406ea81d12bb5b65 (diff) | |
Merge "Revert^2 "Skip C-verification of GL headers."" into main am: aa61e92889 am: c1f905d1fd
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3218118
Change-Id: I2a05f60ad1fd140179cf7b6262f5732456a8387e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/binder/ndk/Android.bp | 3 | ||||
| -rw-r--r-- | opengl/Android.bp | 12 |
2 files changed, 15 insertions, 0 deletions
diff --git a/libs/binder/ndk/Android.bp b/libs/binder/ndk/Android.bp index 26c228d9a4..4e02aceb86 100644 --- a/libs/binder/ndk/Android.bp +++ b/libs/binder/ndk/Android.bp @@ -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 { diff --git a/opengl/Android.bp b/opengl/Android.bp index 4454f36b67..37dc9314e2 100644 --- a/opengl/Android.bp +++ b/opengl/Android.bp @@ -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 { |