Commit b462b32d authored by Eric Roman's avatar Eric Roman Committed by Commit Bot

Rename the cronet workaround patch file in preparation for moving it.

Change-Id: I935dafb8a08ac65871798ba9a74dc2943f672d5c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2268887
Auto-Submit: Eric Roman <eroman@chromium.org>
Commit-Queue: Eric Roman <eroman@chromium.org>
Commit-Queue: Renjie Tang <renjietang@chromium.org>
Reviewed-by: default avatarRenjie Tang <renjietang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#782805}
parent c0daeba3
...@@ -480,8 +480,8 @@ action("cronet_combine_proguard_flags") { ...@@ -480,8 +480,8 @@ action("cronet_combine_proguard_flags") {
sources = [ sources = [
"//base/android/proguard/chromium_code.flags", "//base/android/proguard/chromium_code.flags",
# Massage the proguard rules to work with AppReduce. # Massage the proguard to avoid incompatibilities when building internally.
"//components/cronet/android/cronet_appreduce_workaround.patch", "//components/cronet/android/cronet_workaround.patch",
"//components/cronet/android/cronet_impl_native_proguard.cfg", "//components/cronet/android/cronet_impl_native_proguard.cfg",
] ]
outputs = [ "$target_gen_dir/cronet_impl_native_proguard.cfg" ] outputs = [ "$target_gen_dir/cronet_impl_native_proguard.cfg" ]
......
This patchfile is a stop-gap solution to accomodate differences in syntax for This patchfile is a stop-gap solution to accomodate possible differences in
AppReduce, which is used internally in place of ProGuard. See crbug.com/1004516. supported ProGuard rules when building cronet internally. See crbug.com/1004516.
This patches base/android/proguard/chromium_code.flags. This patches base/android/proguard/chromium_code.flags.
...@@ -9,7 +9,7 @@ cd src ...@@ -9,7 +9,7 @@ cd src
export ORIG_FLAGS="base/android/proguard/chromium_code.flags" export ORIG_FLAGS="base/android/proguard/chromium_code.flags"
cp $ORIG_FLAGS modified.flags cp $ORIG_FLAGS modified.flags
$EDITOR modified.flags $EDITOR modified.flags
diff -u "$ORIG_FLAGS" modified.flags > "components/cronet/android/cronet_appreduce_workaround.patch" diff -u "$ORIG_FLAGS" modified.flags > "components/cronet/android/cronet_workaround.patch"
To test whether the patch applies cleanly use: To test whether the patch applies cleanly use:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment