Hash :
024114b2
Author :
Date :
2022-12-16T11:32:30
Reland "Replace zlib from chrome by Android's zlib." Add zlib to delete_only_deps, otherwise gclient seems to choke on it https://crbug.com/skia/14155#c3 Also git add $root_add_dep instead of "$root_add_dep/*" as the latter wouldn't add deleted directories like third_party/zlib in this case. We also need zlib in unsupported_third_party_deps so that it gets deleted after gclient sync. When a file from a nested git repo was already added to the tree previously, git no longer relies on .git subdirectory detection and works as if .git wasn't there. This is a reland of commit 39f0eaf8095b303b09951ceb6ffda8254ed24c8d Original change's description: > Replace zlib from chrome by Android's zlib. > > 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> Bug: b/262603863 Change-Id: I87226e294a3e293ed5fcdeb2f0cf52f55917c1f3 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4300169 Reviewed-by: Amirali Abdolrashidi <abdolrashidi@google.com> Commit-Queue: Roman Lavrov <romanl@google.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197
#!/bin/bash
# Copyright The ANGLE Project Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
# Generates a roll CL within the ANGLE repository of AOSP.
#
# WARNING: Running this script without args may mess up the checkout.
# See --genAndroidBp for testing just the code generation.
# exit when any command fails
set -eE -o functrace
failure() {
local lineno=$1
local msg=$2
echo "Failed at $lineno: $msg"
}
trap 'failure ${LINENO} "$BASH_COMMAND"' ERR
# Change the working directory to the ANGLE root directory
cd "${0%/*}/.."
GN_OUTPUT_DIRECTORY=out/Android
function generate_Android_bp_file() {
abis=(
"arm"
"arm64"
"x86"
"x64"
)
for abi in "${abis[@]}"; do
# generate gn build files and convert them to blueprints
gn_args=(
"target_os = \"android\""
"is_component_build = false"
"is_debug = false"
"dcheck_always_on = false"
"symbol_level = 0"
"angle_standalone = false"
"angle_build_all = false"
"angle_expose_non_conformant_extensions_and_versions = true"
# Build for 64-bit CPUs
"target_cpu = \"$abi\""
# Target ndk API 26 to make sure ANGLE can use the Vulkan backend on Android
"android32_ndk_api_level = 26"
"android64_ndk_api_level = 26"
# Disable all backends except Vulkan
"angle_enable_vulkan = true"
"angle_enable_gl = false"
"angle_enable_d3d9 = false"
"angle_enable_d3d11 = false"
"angle_enable_null = false"
"angle_enable_metal = false"
# SwiftShader is loaded as the system Vulkan driver on Android, not compiled by ANGLE
"angle_enable_swiftshader = false"
# Disable all shader translator targets except desktop GL (for Vulkan)
"angle_enable_essl = false"
"angle_enable_glsl = false"
"angle_enable_hlsl = false"
"angle_enable_commit_id = false"
# Disable histogram/protobuf support
"angle_has_histograms = false"
# Use system lib(std)c++, since the Chromium library breaks std::string
"use_custom_libcxx = false"
# rapidJSON is used for ANGLE's frame capture (among other things), which is unnecessary for AOSP builds.
"angle_has_rapidjson = false"
)
if [[ "$1" == "--enableApiTrace" ]]; then
gn_args=(
"${gn_args[@]}"
"angle_enable_trace = true"
"angle_enable_trace_android_logcat = true"
)
fi
gn gen ${GN_OUTPUT_DIRECTORY} --args="${gn_args[*]}"
gn desc ${GN_OUTPUT_DIRECTORY} --format=json "*" > ${GN_OUTPUT_DIRECTORY}/desc.$abi.json
done
python3 scripts/generate_android_bp.py \
--gn_json_arm=${GN_OUTPUT_DIRECTORY}/desc.arm.json \
--gn_json_arm64=${GN_OUTPUT_DIRECTORY}/desc.arm64.json \
--gn_json_x86=${GN_OUTPUT_DIRECTORY}/desc.x86.json \
--gn_json_x64=${GN_OUTPUT_DIRECTORY}/desc.x64.json \
> Android.bp
}
if [[ "$1" == "--genAndroidBp" ]];then
generate_Android_bp_file "$2"
exit 0
fi
# Check out depot_tools locally and add it to the path
DEPOT_TOOLS_DIR=_depot_tools
rm -rf ${DEPOT_TOOLS_DIR}
git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git ${DEPOT_TOOLS_DIR}
export PATH=`pwd`/${DEPOT_TOOLS_DIR}:$PATH
third_party_deps=(
"build"
"third_party/abseil-cpp"
"third_party/vulkan-deps/glslang/src"
"third_party/vulkan-deps/spirv-headers/src"
"third_party/vulkan-deps/spirv-tools/src"
"third_party/vulkan-deps/vulkan-headers/src"
"third_party/vulkan_memory_allocator"
)
root_add_deps=(
"build"
"third_party"
)
# Only add the parts of NDK and vulkan-deps that are required by ANGLE. The entire dep is too large.
delete_only_deps=(
"third_party/vulkan-deps"
"third_party/zlib" # Replaced by Android's zlib; delete for gclient to work https://crbug.com/skia/14155#c3
)
# Delete dep directories so that gclient can check them out
for dep in "${third_party_deps[@]}" "${delete_only_deps[@]}"; do
rm -rf "$dep"
done
# Sync all of ANGLE's deps so that 'gn gen' works
python scripts/bootstrap.py
gclient sync --reset --force --delete_unversioned_trees
# Delete outdir to ensure a clean gn run.
rm -rf ${GN_OUTPUT_DIRECTORY}
generate_Android_bp_file
# Delete outdir to cleanup after gn.
rm -rf ${GN_OUTPUT_DIRECTORY}
# Delete all unsupported 3rd party dependencies. Do this after generate_Android_bp_file, so
# it has access to all of the necessary BUILD.gn files.
unsupported_third_party_deps=(
"third_party/jdk"
"third_party/llvm-build"
"third_party/android_build_tools"
"third_party/android_sdk"
"third_party/zlib" # Replaced by Android's zlib
)
for unsupported_third_party_dep in "${unsupported_third_party_deps[@]}"; do
rm -rf "$unsupported_third_party_dep"
done
git add Android.bp
# Delete the .git files in each dep so that it can be added to this repo. Some deps like jsoncpp
# have multiple layers of deps so delete everything before adding them.
for dep in "${third_party_deps[@]}"; do
rm -rf "$dep"/.git
done
extra_removal_files=(
# build/linux is hundreds of megs that aren't needed.
"build/linux"
# Debuggable APKs cannot be merged into AOSP as a prebuilt
"build/android/CheckInstallApk-debug.apk"
# Remove Android.mk files to prevent automated CLs:
# "[LSC] Add LOCAL_LICENSE_KINDS to external/angle"
"Android.mk"
"third_party/vulkan-deps/glslang/src/Android.mk"
"third_party/vulkan-deps/glslang/src/ndk_test/Android.mk"
"third_party/vulkan-deps/spirv-tools/src/Android.mk"
"third_party/vulkan-deps/spirv-tools/src/android_test/Android.mk"
)
for removal_file in "${extra_removal_files[@]}"; do
rm -rf "$removal_file"
done
# Add all changes under $root_add_deps so we delete everything not explicitly allowed.
for root_add_dep in "${root_add_deps[@]}"; do
git add -f $root_add_dep
done
# Done with depot_tools
rm -rf $DEPOT_TOOLS_DIR