gn2bp: Add apply patch function to gen_desc_json.sh
Test: ./gen_desc_json.sh
Change-Id: I971ad72a562a1340fa4a6f29468b7415915a7335
diff --git a/tools/gn2bp/gen_desc_json.sh b/tools/gn2bp/gen_desc_json.sh
index ed684b3..6d1a4f2 100755
--- a/tools/gn2bp/gen_desc_json.sh
+++ b/tools/gn2bp/gen_desc_json.sh
@@ -2,11 +2,34 @@
set -x
# Run this script inside a full chromium checkout.
-# TODO: add support for applying local patches.
OUT_PATH="out/cronet"
#######################################
+# Apply patches in external/cronet.
+# Globals:
+# ANDROID_BUILD_TOP
+# Arguments:
+# None
+#######################################
+function apply_patches() {
+ local -r patch_root="${ANDROID_BUILD_TOP}/external/cronet/patches"
+
+ local upstream_patches
+ upstream_patches=$(ls "${patch_root}/upstream-next")
+ local patch
+ for patch in ${upstream_patches}; do
+ git am --3way "${patch_root}/upstream-next/${patch}"
+ done
+
+ local local_patches
+ local_patches=$(ls "${patch_root}/local")
+ for patch in ${local_patches}; do
+ git am --3way "${patch_root}/local/${patch}"
+ done
+}
+
+#######################################
# Generate desc.json for a specified architecture.
# Globals:
# OUT_PATH
@@ -48,6 +71,7 @@
gn desc "${OUT_PATH}" --format=json --all-toolchains "//*" > "${out_file}"
}
+apply_patches
gn_desc x86
gn_desc x64
gn_desc arm