`gn format` recently changed its formatting behavior
for deps, source, and a few other elements when they
are assigned (with =) single-element lists to be consistent
with the formatting of updates (with +=) with single-element.
Now that we've rolled in a GN binary with the change,
reformat all files so that people don't get presubmit
warnings due to this.
This CL was uploaded by me.
Bug: 1041419
Change-Id: I38ec77c3b62ca279286533ab1503f347b79a567e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2005628
Commit-Queue: Nico Weber <thakis@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Auto-Submit: Nico Weber <thakis@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#732629}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 74eeac7906a84a2bc378d73913b85d0fafb303db
This flag has been on the way out for a while. It's been removed from
bot build configurations, and hence has reached the end of its useful
life.
TBR'ing Dirk for the trivial removal in compiler.gni.
TBR=dpranke@chromium.org
Bug: 1029105
Change-Id: Ib841c4245b74d8f40661b2fe278da5a36efe72e9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1952394
Commit-Queue: Christopher Grant <cjgrant@chromium.org>
Reviewed-by: Peter Wen <wnwen@chromium.org>
Reviewed-by: Richard Coles <torne@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#722062}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: da03a8b96edef5fe69eca42b7c58e4b672f20248
This reverts commit 9866f6ae1da249231ad7fdc77b165bdc419495ce.
Reason for revert: ApkMerger script is fixed in cl:
https://chromium-review.googlesource.com/c/chromium/src/+/1496316
Original change's description:
> Revert "Make sure unwind tables are added for 32 bit libraries in arm64 monochrome"
>
> This reverts commit 200a953f909f0fc2df0b58360801619cb3257461.
>
> Reason for revert: Breaking official build due to APK merge.
>
> Original change's description:
> > Make sure unwind tables are added for 32 bit libraries in arm64 monochrome
> >
> > The assets were not added since we checked "can_unwind_with_cfi_table"
> > value, which depends on "build_secondary_abi" build arg. So, explicitly
> > add the asset for 64-bit monochrome apk, which contains 32 bit library.
> >
> > BUG=924842
> >
> > Change-Id: I6488d5c4e5a80787735c5b09134b013a87b5c553
> > Reviewed-on: https://chromium-review.googlesource.com/c/1432836
> > Commit-Queue: ssid <ssid@chromium.org>
> > Reviewed-by: Andrew Grieve <agrieve@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#625789}
>
> TBR=ssid@chromium.org,agrieve@chromium.org
>
> # Not skipping CQ checks because original CL landed > 1 day ago.
>
> Bug: 924842
> Change-Id: Ic8e542cc1cf52f24b7866c1620ac764bf2f92672
> Reviewed-on: https://chromium-review.googlesource.com/c/1439074
> Reviewed-by: Ben Mason <benmason@chromium.org>
> Commit-Queue: Ben Mason <benmason@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#626505}
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: 924842
Change-Id: I36b5cd2ab479f3038e3c31a69fe70aacef4db618
Reviewed-on: https://chromium-review.googlesource.com/c/1496275
Commit-Queue: ssid <ssid@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#636904}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: b610970f1a184cebbd7c50208597b64009beeb1b
This reverts commit 200a953f909f0fc2df0b58360801619cb3257461.
Reason for revert: Breaking official build due to APK merge.
Original change's description:
> Make sure unwind tables are added for 32 bit libraries in arm64 monochrome
>
> The assets were not added since we checked "can_unwind_with_cfi_table"
> value, which depends on "build_secondary_abi" build arg. So, explicitly
> add the asset for 64-bit monochrome apk, which contains 32 bit library.
>
> BUG=924842
>
> Change-Id: I6488d5c4e5a80787735c5b09134b013a87b5c553
> Reviewed-on: https://chromium-review.googlesource.com/c/1432836
> Commit-Queue: ssid <ssid@chromium.org>
> Reviewed-by: Andrew Grieve <agrieve@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#625789}
TBR=ssid@chromium.org,agrieve@chromium.org
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: 924842
Change-Id: Ic8e542cc1cf52f24b7866c1620ac764bf2f92672
Reviewed-on: https://chromium-review.googlesource.com/c/1439074
Reviewed-by: Ben Mason <benmason@chromium.org>
Commit-Queue: Ben Mason <benmason@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#626505}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 9866f6ae1da249231ad7fdc77b165bdc419495ce
The assets were not added since we checked "can_unwind_with_cfi_table"
value, which depends on "build_secondary_abi" build arg. So, explicitly
add the asset for 64-bit monochrome apk, which contains 32 bit library.
BUG=924842
Change-Id: I6488d5c4e5a80787735c5b09134b013a87b5c553
Reviewed-on: https://chromium-review.googlesource.com/c/1432836
Commit-Queue: ssid <ssid@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#625789}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 200a953f909f0fc2df0b58360801619cb3257461
This makes the apk_merger script cleaner.
BUG=819888
Change-Id: Ica38505114a459326b8b0be6fd59e2fa6636c84e
Reviewed-on: https://chromium-review.googlesource.com/999152
Commit-Queue: Siddhartha S <ssid@chromium.org>
Reviewed-by: agrieve <agrieve@chromium.org>
Reviewed-by: Richard Coles <torne@chromium.org>
Reviewed-by: Maria Khomenko <mariakhomenko@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#548952}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 99f9e4912742ced2d5cd519763e4f81a32ace27d
This reverts commit ef18e86a1e65f29a7415964aec310d9b40619b39.
Reason for revert: Make sure apk_merger.py works with and without the
unwind file, till downstream cl lands. Also rebase on:
https://chromium-review.googlesource.com/c/chromium/src/+/994545
and remove workaround for crbug/828528.
Original change's description:
> Revert "Enable extracting unwind table on official builds without channel"
>
> This reverts commit 16e808d789d05fcc2bfcc8b00e002d11405adb1a.
>
> Reason for revert: Merge step still failing.
>
> Original change's description:
> > Enable extracting unwind table on official builds without channel
> >
> > The original cl was here:
> > https://chromium-review.googlesource.com/c/chromium/src/+/990092
> > This CL fixes the following problems with the original CL:
> > 1. The apk_merger script fails because the unwind tables were only added
> > in 32-bit apk. The merger script expects all the files to be same and
> > the ones different should be checked.
> > 1a. The resources.arsc is non-hermetic and ordering is affected by
> > adding file to only one apk. As a workaround for crbug/828528,
> > add an empty (valid) unwind table file to the 64 bit monochrome
> > apk to make the resource.arsc consistent.
> > 1b. The merger script simply adds all the files in apk which are not
> > same. To keep the script simple and functional, the unwind resource
> > is renamed to unwind_cfi_32 and unwind_cfi_empty in respective
> > builds and the app_merger is updated to specify this file is
> > expected to be different and included. This causes an extra file
> > (4 byte) in the merged apk.
> >
> > 2. The unwind tables were always generated for "libchrome.so" for all
> > chrome apks. The different chrome_apk(s) have different shared
> > libraries like libchromefortest, etc.. So, update the unwind asset to
> > get unwind table for the right library for each apk. Only adds assets
> > to *_public_apk(s).
> >
> > 3. The monochrome_apk_checker was failing because the unwind file
> > included was different in chrome_apk and monochrome_apk. This CL adds
> > the asset to all apk at the same time and adds exception for this
> > file.
> >
> > BUG=819888
> > TBR=dpranke@chromium.org
> >
> > Change-Id: Ibceeeacc19fa424d519891b8c17e349ee6c2dfd6
> > Reviewed-on: https://chromium-review.googlesource.com/991236
> > Commit-Queue: Siddhartha S <ssid@chromium.org>
> > Reviewed-by: Maria Khomenko <mariakhomenko@chromium.org>
> > Reviewed-by: Bo <boliu@chromium.org>
> > Reviewed-by: agrieve <agrieve@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#547993}
>
> TBR=boliu@chromium.org,dpranke@chromium.org,mariakhomenko@chromium.org,changwan@chromium.org,ssid@chromium.org,agrieve@chromium.org
>
> Change-Id: I0a96e213133b6cb21c36db365b7c72f0f4642c8e
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: 819888
> Bug: 828879
> Reviewed-on: https://chromium-review.googlesource.com/995697
> Reviewed-by: Anthony Berent <aberent@chromium.org>
> Commit-Queue: Anthony Berent <aberent@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#548066}
TBR=dpranke@chromium.org,mariakhomenko@chromium.org
Bug: 819888, 828879
Change-Id: I2eba81de32632bea90171ece4cba1a4144c55d25
Reviewed-on: https://chromium-review.googlesource.com/996272
Commit-Queue: Siddhartha S <ssid@chromium.org>
Reviewed-by: agrieve <agrieve@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Reviewed-by: Changwan Ryu <changwan@chromium.org>
Reviewed-by: Siddhartha S <ssid@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#548249}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 6c58c0c66be9b01d330d6bd3661ca3effbd25df1
This reverts commit 16e808d789d05fcc2bfcc8b00e002d11405adb1a.
Reason for revert: Merge step still failing.
Original change's description:
> Enable extracting unwind table on official builds without channel
>
> The original cl was here:
> https://chromium-review.googlesource.com/c/chromium/src/+/990092
> This CL fixes the following problems with the original CL:
> 1. The apk_merger script fails because the unwind tables were only added
> in 32-bit apk. The merger script expects all the files to be same and
> the ones different should be checked.
> 1a. The resources.arsc is non-hermetic and ordering is affected by
> adding file to only one apk. As a workaround for crbug/828528,
> add an empty (valid) unwind table file to the 64 bit monochrome
> apk to make the resource.arsc consistent.
> 1b. The merger script simply adds all the files in apk which are not
> same. To keep the script simple and functional, the unwind resource
> is renamed to unwind_cfi_32 and unwind_cfi_empty in respective
> builds and the app_merger is updated to specify this file is
> expected to be different and included. This causes an extra file
> (4 byte) in the merged apk.
>
> 2. The unwind tables were always generated for "libchrome.so" for all
> chrome apks. The different chrome_apk(s) have different shared
> libraries like libchromefortest, etc.. So, update the unwind asset to
> get unwind table for the right library for each apk. Only adds assets
> to *_public_apk(s).
>
> 3. The monochrome_apk_checker was failing because the unwind file
> included was different in chrome_apk and monochrome_apk. This CL adds
> the asset to all apk at the same time and adds exception for this
> file.
>
> BUG=819888
> TBR=dpranke@chromium.org
>
> Change-Id: Ibceeeacc19fa424d519891b8c17e349ee6c2dfd6
> Reviewed-on: https://chromium-review.googlesource.com/991236
> Commit-Queue: Siddhartha S <ssid@chromium.org>
> Reviewed-by: Maria Khomenko <mariakhomenko@chromium.org>
> Reviewed-by: Bo <boliu@chromium.org>
> Reviewed-by: agrieve <agrieve@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#547993}
TBR=boliu@chromium.org,dpranke@chromium.org,mariakhomenko@chromium.org,changwan@chromium.org,ssid@chromium.org,agrieve@chromium.org
Change-Id: I0a96e213133b6cb21c36db365b7c72f0f4642c8e
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 819888
Bug: 828879
Reviewed-on: https://chromium-review.googlesource.com/995697
Reviewed-by: Anthony Berent <aberent@chromium.org>
Commit-Queue: Anthony Berent <aberent@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#548066}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: ef18e86a1e65f29a7415964aec310d9b40619b39
The original cl was here:
https://chromium-review.googlesource.com/c/chromium/src/+/990092
This CL fixes the following problems with the original CL:
1. The apk_merger script fails because the unwind tables were only added
in 32-bit apk. The merger script expects all the files to be same and
the ones different should be checked.
1a. The resources.arsc is non-hermetic and ordering is affected by
adding file to only one apk. As a workaround for crbug/828528,
add an empty (valid) unwind table file to the 64 bit monochrome
apk to make the resource.arsc consistent.
1b. The merger script simply adds all the files in apk which are not
same. To keep the script simple and functional, the unwind resource
is renamed to unwind_cfi_32 and unwind_cfi_empty in respective
builds and the app_merger is updated to specify this file is
expected to be different and included. This causes an extra file
(4 byte) in the merged apk.
2. The unwind tables were always generated for "libchrome.so" for all
chrome apks. The different chrome_apk(s) have different shared
libraries like libchromefortest, etc.. So, update the unwind asset to
get unwind table for the right library for each apk. Only adds assets
to *_public_apk(s).
3. The monochrome_apk_checker was failing because the unwind file
included was different in chrome_apk and monochrome_apk. This CL adds
the asset to all apk at the same time and adds exception for this
file.
BUG=819888
TBR=dpranke@chromium.org
Change-Id: Ibceeeacc19fa424d519891b8c17e349ee6c2dfd6
Reviewed-on: https://chromium-review.googlesource.com/991236
Commit-Queue: Siddhartha S <ssid@chromium.org>
Reviewed-by: Maria Khomenko <mariakhomenko@chromium.org>
Reviewed-by: Bo <boliu@chromium.org>
Reviewed-by: agrieve <agrieve@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#547993}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 16e808d789d05fcc2bfcc8b00e002d11405adb1a
This reverts commit a2474b6490ea9cfda76528059fbf23369e7d281f.
Reason for revert: The failure was due to parent CL getting reverted
Relanded parent in: https://chromium-review.googlesource.com/c/chromium/src/+/984452
Original change's description:
> Revert "Enable extracting unwind table on official builds without channel"
>
> This reverts commit eb07cea1254cc280dfec0c8ca0e6411dfcceecca.
>
> Reason for revert: Windows tryjobs are failing.
> https://logs.chromium.org/v/?s=chromium%2Fbb%2Ftryserver.chromium.win%2Fwin-msvc-rel%2F81420%2F%2B%2Frecipes%2Fsteps%2Fanalyze%2F0%2Fstdout for an example.
>
> ERROR at //base/BUILD.gn:1802:33: Undefined identifier in string expansion.
> "CAN_UNWIND_WITH_CFI_TABLE=$can_unwind_with_cfi_table",
> ^------------------------
> "can_unwind_with_cfi_table" is not currently in scope.
> See //BUILD.gn:65:5: which caused the file to be included.
> "//base:base_perftests",
> ^----------------------
> GN gen failed: 1
>
> Original change's description:
> > Enable extracting unwind table on official builds without channel
> >
> > This CL enables extraction of unwind tables for chrome when
> > is_official_build is set to true and when android_channel is not set to
> > a release channel. This affects build time only on official builds.
> > Also, Set legacy heap profiler to use unwinder for profiling.
> >
> > TBR=dpranke@chromium.org
> > BUG=819888
> >
> > Change-Id: If9732b5ac1f9dff49c58e88e2ffb6cb387715244
> > Reviewed-on: https://chromium-review.googlesource.com/976944
> > Reviewed-by: Siddhartha S <ssid@chromium.org>
> > Reviewed-by: agrieve <agrieve@chromium.org>
> > Commit-Queue: Siddhartha S <ssid@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#546425}
>
> TBR=dpranke@chromium.org,ssid@chromium.org,agrieve@chromium.org
>
> Change-Id: Id033094871dfcf74248f631390f15f379d9cd3c7
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: 819888
> Reviewed-on: https://chromium-review.googlesource.com/983893
> Reviewed-by: agrieve <agrieve@chromium.org>
> Commit-Queue: agrieve <agrieve@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#546478}
TBR=dpranke@chromium.org,ssid@chromium.org,agrieve@chromium.org
Change-Id: I100f540c8d5bc9f59b9631ea207c7f290dc42e96
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 819888
Reviewed-on: https://chromium-review.googlesource.com/985112
Commit-Queue: Siddhartha S <ssid@chromium.org>
Reviewed-by: Siddhartha S <ssid@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#547196}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 0db71a0dbc0636c7281b72d1ab7b59a269c5043a
This reverts commit eb07cea1254cc280dfec0c8ca0e6411dfcceecca.
Reason for revert: Windows tryjobs are failing.
https://logs.chromium.org/v/?s=chromium%2Fbb%2Ftryserver.chromium.win%2Fwin-msvc-rel%2F81420%2F%2B%2Frecipes%2Fsteps%2Fanalyze%2F0%2Fstdout for an example.
ERROR at //base/BUILD.gn:1802:33: Undefined identifier in string expansion.
"CAN_UNWIND_WITH_CFI_TABLE=$can_unwind_with_cfi_table",
^------------------------
"can_unwind_with_cfi_table" is not currently in scope.
See //BUILD.gn:65:5: which caused the file to be included.
"//base:base_perftests",
^----------------------
GN gen failed: 1
Original change's description:
> Enable extracting unwind table on official builds without channel
>
> This CL enables extraction of unwind tables for chrome when
> is_official_build is set to true and when android_channel is not set to
> a release channel. This affects build time only on official builds.
> Also, Set legacy heap profiler to use unwinder for profiling.
>
> TBR=dpranke@chromium.org
> BUG=819888
>
> Change-Id: If9732b5ac1f9dff49c58e88e2ffb6cb387715244
> Reviewed-on: https://chromium-review.googlesource.com/976944
> Reviewed-by: Siddhartha S <ssid@chromium.org>
> Reviewed-by: agrieve <agrieve@chromium.org>
> Commit-Queue: Siddhartha S <ssid@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#546425}
TBR=dpranke@chromium.org,ssid@chromium.org,agrieve@chromium.org
Change-Id: Id033094871dfcf74248f631390f15f379d9cd3c7
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 819888
Reviewed-on: https://chromium-review.googlesource.com/983893
Reviewed-by: agrieve <agrieve@chromium.org>
Commit-Queue: agrieve <agrieve@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#546478}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: a2474b6490ea9cfda76528059fbf23369e7d281f
This CL enables extraction of unwind tables for chrome when
is_official_build is set to true and when android_channel is not set to
a release channel. This affects build time only on official builds.
Also, Set legacy heap profiler to use unwinder for profiling.
TBR=dpranke@chromium.org
BUG=819888
Change-Id: If9732b5ac1f9dff49c58e88e2ffb6cb387715244
Reviewed-on: https://chromium-review.googlesource.com/976944
Reviewed-by: Siddhartha S <ssid@chromium.org>
Reviewed-by: agrieve <agrieve@chromium.org>
Commit-Queue: Siddhartha S <ssid@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#546425}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: eb07cea1254cc280dfec0c8ca0e6411dfcceecca
The extract_unwind_tables script dumps the breakpad symbol file and
extracts cfi unwind table from it.
The output format is discussed in this doc:
https://docs.google.com/document/d/1TLuUZ1HaMO6Rv0Q9Y1-w4a-9wcyia1VygQbs4Osb7Oo
This is just a basic format and will be changed in subsequent cl for
size efficiency and performance.
BUG=819888
Change-Id: I987aa2e4ef37f86b6553410d7ee73c15f655495b
Reviewed-on: https://chromium-review.googlesource.com/956971
Commit-Queue: Siddhartha S <ssid@chromium.org>
Reviewed-by: agrieve <agrieve@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#542736}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 7819ba6a2af0d732806aaea80db94361cd626d6e
The unwind tables are stripped from release builds. This CL adds a
script to extract the unwind table sections from unstripped binary and
adds it as an asset file in the apk.
This script is first used in the test apk, when add_unwind_tables_in_apk
is specified. Will be used later added to chrome apk.
BUG=819888
Change-Id: I68d2ea843ed0c7a7a3ee60c48f683e01809ff217
Reviewed-on: https://chromium-review.googlesource.com/954421
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Reviewed-by: agrieve <agrieve@chromium.org>
Commit-Queue: Siddhartha S <ssid@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#542699}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 764226bdbd10e46076fbc691bcaa27f050075c7a
Nico Weber
Christopher Grant
ssid
Ben Mason
Anthony Berent
agrieve