godotengine/godot-angle-static
1
0
Fork 0
mirror of https://github.com/godotengine/godot-angle-static.git synced 2026-01-06 02:09:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Replace zlib from chrome by Android's zlib.

Browse Source 
Implements Elliott's https://r.android.com/2360448 in our codegen. The
only diffs are ordering and third_party_android_ndk_cpu_features.
We only seem to depend on cpufeatures for zlib.

//third_party/zlib/google:compression_utils_portable is the root
dependency, so cutting it makes other zlib libs disappear from
Android.bp

zlib_google_compression_utils_portable and libz_static
that this CL depends on were added in https://r.android.com/2359720

Tested by running roll_aosp.sh in Android tree and building.
third_party/zlib got deleted locally so presumably it should
get deleted by the roller

Bug: b/262603863
Change-Id: I2651cc21121d741526055fa2b0288d0dcfa5c62a
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4111891
Reviewed-by: Cody Northrop <cnorthrop@google.com>
Commit-Queue: Roman Lavrov <romanl@google.com>
This commit is contained in:
Roman Lavrov
2022-12-16 11:32:30 -05:00
committed by Angle LUCI CQ
parent d3fcf08d02
commit 39f0eaf809
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/generate_android_bp.py
View File

@@ -196,19 +196,22 @@ def gn_sources_to_blueprint_sources(sources):
target_blockist = [
'//build/config:shared_library_deps',
'//third_party/vulkan-validation-layers/src:vulkan_clean_old_validation_layer_objects',
'//third_party/zlib:zlib',
'//third_party/zlib/google:compression_utils_portable',
]
third_party_target_allowlist = [
'//third_party/abseil-cpp',
'//third_party/vulkan-deps',
'//third_party/vulkan_memory_allocator',
'//third_party/zlib',
]
include_blocklist = [
'//buildtools/third_party/libc++/',
'//out/Android/gen/third_party/vulkan-deps/glslang/src/include/',
'//third_party/android_ndk/sources/android/cpufeatures/',
'//third_party/zlib/',
'//third_party/zlib/google/',
]
@@ -255,13 +258,10 @@ def gn_deps_to_blueprint_deps(abi, target, build_info):
# target depends on another's genrule, it wont find the outputs. Propogate generated
# headers up the dependency stack.
generated_headers += child_generated_headers
elif dep == '//third_party/android_ndk:cpu_features':
# chrome_zlib needs cpufeatures from the Android NDK. Rather than including the
# entire NDK is a dep in the ANGLE checkout, use the library that's already part
# of Android.
dep_info = build_info[abi][dep]
blueprint_dep_name = gn_target_to_blueprint_target(dep, dep_info)
static_libs.append('cpufeatures')
elif dep == '//third_party/zlib/google:compression_utils_portable':
# Replace zlib by Android's zlib, compression_utils_portable is the root dependency
static_libs.extend(
['zlib_google_compression_utils_portable', 'libz_static', 'cpufeatures'])
return static_libs, shared_libs, defaults, generated_headers, header_libs
@@ -660,7 +660,6 @@ def main():
'third_party/vulkan-deps/vulkan-headers/LICENSE.txt',
'third_party/vulkan-deps/vulkan-headers/src/LICENSE.txt',
'third_party/vulkan_memory_allocator/LICENSE.txt',
'third_party/zlib/LICENSE',
'tools/flex-bison/third_party/m4sugar/LICENSE',
'tools/flex-bison/third_party/skeletons/LICENSE',
'util/windows/third_party/StackWalker/LICENSE',