Commit Graph

54360 Commits

Author SHA1 Message Date
Wei Li
1d0f46e58d Merge "Add new property "exclude_files_in_output" for excluding files from the output files of Java related modules." am: 9ab9437b40 am: b2ee4a8aa0 am: 6cf2fdb71e am: b55a98dd1f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1944246

Change-Id: Ide374c607d6cee008a3732c3d19a581319cbaeab
2022-01-12 10:38:34 +00:00
Wei Li
b55a98dd1f Merge "Add new property "exclude_files_in_output" for excluding files from the output files of Java related modules." am: 9ab9437b40 am: b2ee4a8aa0 am: 6cf2fdb71e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1944246

Change-Id: I07d5d7e31b36090bd29e0070288af21ad446197a
2022-01-12 10:19:12 +00:00
Wei Li
6cf2fdb71e Merge "Add new property "exclude_files_in_output" for excluding files from the output files of Java related modules." am: 9ab9437b40 am: b2ee4a8aa0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1944246

Change-Id: Icf986d08e6dccca4ba48bce616bd2bba65d87e2f
2022-01-12 10:01:48 +00:00
Wei Li
b2ee4a8aa0 Merge "Add new property "exclude_files_in_output" for excluding files from the output files of Java related modules." am: 9ab9437b40
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1944246

Change-Id: I000e2f69a60e1d04ef141473cb9c09e0341ed42a
2022-01-12 09:44:12 +00:00
Wei Li
9ab9437b40 Merge "Add new property "exclude_files_in_output" for excluding files from the output files of Java related modules." 2022-01-12 09:25:22 +00:00
Treehugger Robot
3bb1f5e3ac Merge "Remove self from OWNERS" am: e751b5355e am: 7b042a2500 am: efd9d246e6 am: 0563235bbc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1939233

Change-Id: Ib83f5c7736dbb50d2bdaa41f1dbffb9e68754c43
2022-01-12 02:48:44 +00:00
Treehugger Robot
0563235bbc Merge "Remove self from OWNERS" am: e751b5355e am: 7b042a2500 am: efd9d246e6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1939233

Change-Id: I4785ee925f8777cb4ac1bf6e5dd1351a03d53bce
2022-01-12 02:23:31 +00:00
Treehugger Robot
efd9d246e6 Merge "Remove self from OWNERS" am: e751b5355e am: 7b042a2500
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1939233

Change-Id: I8d8c4944d71026d412d53802e0dc6b30728553dd
2022-01-12 02:11:37 +00:00
Treehugger Robot
7b042a2500 Merge "Remove self from OWNERS" am: e751b5355e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1939233

Change-Id: Ia30ffcd2b6c885a1b0e12f778a7ea9e18d6be680
2022-01-12 01:58:48 +00:00
Treehugger Robot
e751b5355e Merge "Remove self from OWNERS" 2022-01-12 01:45:56 +00:00
Wei Li
1e73c6573e Add new property "exclude_files_in_output" for excluding files from the output files of Java related modules.
Bug: 204888276
Test: m service-permission
Change-Id: I9f6113834826358b0e3af22ed1dd63a43c255452
2022-01-11 14:20:16 -08:00
Colin Cross
8b0ebe853d [automerger skipped] [automerge] Revert "Time out and dump stacks from R8 processes after 30 minutes" 2p: b18a037fc6 am: 44c522badf am: 340b39da38 -s ours am: 0eb8e4da87 -s ours
am skip reason: Merged-In Ia0c3826aea3288e9db3bdbd4955e1e16c0a38fe3 with SHA-1 b18a037fc6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/16426550

Change-Id: I5369093ec1cbe0fc547d7b5e6d0b1a45e4e11c4b
2022-01-11 22:13:05 +00:00
Colin Cross
7078902a03 [automerger skipped] [automerge] Revert "Time out and dump stacks from R8 processes after 30 minutes" 2p: b18a037fc6 am: 44c522badf -s ours am: 553f9d26d2 -s ours am: 5c3731f5b6 -s ours
am skip reason: Merged-In Ia0c3826aea3288e9db3bdbd4955e1e16c0a38fe3 with SHA-1 a832a04db2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/16426550

Change-Id: I1649dc82d7268f8d424ec03e3c5eafcf0f2ef6cd
2022-01-11 22:10:57 +00:00
Colin Cross
0eb8e4da87 [automerger skipped] [automerge] Revert "Time out and dump stacks from R8 processes after 30 minutes" 2p: b18a037fc6 am: 44c522badf am: 340b39da38 -s ours
am skip reason: Merged-In Ia0c3826aea3288e9db3bdbd4955e1e16c0a38fe3 with SHA-1 b18a037fc6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/16426550

Change-Id: I54a5b31baf12b44b5d7c924ac5cc81e606b1da80
2022-01-11 21:51:47 +00:00
Colin Cross
5c3731f5b6 [automerger skipped] [automerge] Revert "Time out and dump stacks from R8 processes after 30 minutes" 2p: b18a037fc6 am: 44c522badf -s ours am: 553f9d26d2 -s ours
am skip reason: Merged-In Ia0c3826aea3288e9db3bdbd4955e1e16c0a38fe3 with SHA-1 a832a04db2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/16426550

Change-Id: I468dc79016b8b74e9136b3e6d2b7b424b1573a21
2022-01-11 21:50:45 +00:00
Colin Cross
340b39da38 [automerge] Revert "Time out and dump stacks from R8 processes after 30 minutes" 2p: b18a037fc6 am: 44c522badf
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/16426550

Change-Id: Icf53dbe05f00dad699ea1f8ce968f2afa3b78235
2022-01-11 21:33:01 +00:00
Colin Cross
553f9d26d2 [automerger skipped] [automerge] Revert "Time out and dump stacks from R8 processes after 30 minutes" 2p: b18a037fc6 am: 44c522badf -s ours
am skip reason: Merged-In Ia0c3826aea3288e9db3bdbd4955e1e16c0a38fe3 with SHA-1 a832a04db2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/16426550

Change-Id: I55acd2b880a7dc5efa78cf2f732f3358e7219fd2
2022-01-11 21:32:55 +00:00
Colin Cross
66d773bf9b [automerger skipped] Merge changes from topic "presubmit-am-7cab244dfd894a60b70da0836519d8e0" into sc-mainline-prod am: b6b3b0d229 -s ours
am skip reason: Merged-In Ia0c3826aea3288e9db3bdbd4955e1e16c0a38fe3 with SHA-1 b18a037fc6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/16426547

Change-Id: I808184c86856d96f06a4a4e9b2105bda08c487b6
2022-01-11 21:31:47 +00:00
Colin Cross
f9f43e847f Merge changes from topic "presubmit-am-7cab244dfd894a60b70da0836519d8e0"
* changes:
  [automerged blank] Revert "Time out and dump stacks from R8 processes after 30 minutes" 2p: b18a037fc6 2p: a88b88e2be
  [automerge] Revert "Time out and dump stacks from R8 processes after 30 minutes" 2p: b18a037fc6
  Revert "Time out and dump stacks from R8 processes after 30 minutes"
2022-01-11 21:12:31 +00:00
Colin Cross
b6b3b0d229 Merge changes from topic "presubmit-am-7cab244dfd894a60b70da0836519d8e0" into sc-mainline-prod
* changes:
  [automerge] Revert "Time out and dump stacks from R8 processes after 30 minutes" 2p: b18a037fc6
  Revert "Time out and dump stacks from R8 processes after 30 minutes"
2022-01-11 21:12:31 +00:00
Maciej Żenczykowski
94615e93fd [automerger skipped] Merge changes from topic "canned_fs_config_sc_mainline_prod" into sc-mainline-prod am: 8c207a0d1f -s ours
am skip reason: Merged-In I484e46ff819a5266c1e8046dae337e18ef3fefea with SHA-1 b90099d84e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/16564453

Change-Id: Ifeb77a60797baf8a0b4ddc5d75deb7c95b097db9
2022-01-11 20:24:51 +00:00
Maciej Żenczykowski
8c207a0d1f Merge changes from topic "canned_fs_config_sc_mainline_prod" into sc-mainline-prod
* changes:
  Merge changes from topic "canned_fs_config" am: ae9cf26353 am: 33fd601118 am: a214351987 am: 7cc9a75156
  Merge "Improve handling of errors from zipinfo" am: b02043b84d am: 4b3afb7798 am: 0bbc2d0229 am: ce2624cf88 am: d0cfac1546
2022-01-11 20:06:36 +00:00
Maciej Żenczykowski
f5b6c58a31 Merge "[automerged blank] Merge "Improve handling of errors from zipinfo" am: b02043b84d am: 4b3afb7798 am: 0bbc2d0229 am: ce2624cf88 am: d0cfac1546 2p: 5d8246e2c9" 2022-01-11 20:06:36 +00:00
Maciej Żenczykowski
f67bb2c62b Merge changes from topic "canned_fs_config_sc_mainline_prod"
* changes:
  [automerged blank] Merge changes from topic "canned_fs_config" am: ae9cf26353 am: 33fd601118 am: a214351987 am: 7cc9a75156 2p: b90099d84e
  Merge changes from topic "canned_fs_config" am: ae9cf26353 am: 33fd601118 am: a214351987 am: 7cc9a75156
  Merge "Improve handling of errors from zipinfo" am: b02043b84d am: 4b3afb7798 am: 0bbc2d0229 am: ce2624cf88 am: d0cfac1546
2022-01-11 20:06:36 +00:00
Jingwen Chen
01acb879eb Merge "Revert "bp2build: convert host & prebuilt header libraries"" am: ed4900f9d9 am: 4c909dcd5e am: 446f85be40 am: a7cf23531e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1944703

Change-Id: I99d3a8f4dfeb21d115f64c75fca9359ffa1d28fa
2022-01-11 16:06:00 +00:00
Jingwen Chen
a7cf23531e Merge "Revert "bp2build: convert host & prebuilt header libraries"" am: ed4900f9d9 am: 4c909dcd5e am: 446f85be40
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1944703

Change-Id: I9e21377fba0a9f34c88e4555c264dc8542e57fad
2022-01-11 15:51:40 +00:00
Jingwen Chen
446f85be40 Merge "Revert "bp2build: convert host & prebuilt header libraries"" am: ed4900f9d9 am: 4c909dcd5e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1944703

Change-Id: I147d6aa0bee6ac917fa2e253f91f518660e9e919
2022-01-11 15:41:24 +00:00
Jingwen Chen
4c909dcd5e Merge "Revert "bp2build: convert host & prebuilt header libraries"" am: ed4900f9d9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1944703

Change-Id: I44da26de6b2cedb90a945e325971050b5654bc4e
2022-01-11 15:17:52 +00:00
Jingwen Chen
ed4900f9d9 Merge "Revert "bp2build: convert host & prebuilt header libraries"" 2022-01-11 14:58:56 +00:00
Jingwen Chen
105deedfc7 Revert "bp2build: convert host & prebuilt header libraries"
This reverts commit d8a72d7dc9.

Reason for revert: root cause for b/214013899

Change-Id: If769708408c419c2fd3d9484fbf40202b7276299
2022-01-11 12:51:27 +00:00
Ian Zerny
c668a692dc Merge "Add mapping id to source file information for R8 full-mode builds." am: a52cbd67a3 am: 587380225f am: 2a79ac7356 am: 9fef1137fa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1878501

Change-Id: I9be5ad895dfd07bbba6fd99aa5cc7934c97cb4b8
2022-01-11 08:12:58 +00:00
Treehugger Robot
d887d9b452 Merge changes I9ad66ea2,I4c95b77b am: 57271b9f45 am: a7c0107744 am: 16213c6bbe am: f7e9e1f434
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1934955

Change-Id: I5e05dbd3bca3c14bb52ad383c8af3eaf491222a1
2022-01-11 08:11:46 +00:00
Ian Zerny
9fef1137fa Merge "Add mapping id to source file information for R8 full-mode builds." am: a52cbd67a3 am: 587380225f am: 2a79ac7356
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1878501

Change-Id: I969a79e9b947e855733c63e9697c6617d06ec92a
2022-01-11 08:10:18 +00:00
Ian Zerny
2a79ac7356 Merge "Add mapping id to source file information for R8 full-mode builds." am: a52cbd67a3 am: 587380225f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1878501

Change-Id: I44538c8282d009e5893af5af1460f0261a020ef7
2022-01-11 07:51:46 +00:00
Ian Zerny
587380225f Merge "Add mapping id to source file information for R8 full-mode builds." am: a52cbd67a3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1878501

Change-Id: I5564556961b4985ad7591ebd45d30248889c7efc
2022-01-11 07:37:58 +00:00
Treehugger Robot
f7e9e1f434 Merge changes I9ad66ea2,I4c95b77b am: 57271b9f45 am: a7c0107744 am: 16213c6bbe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1934955

Change-Id: I111e14b3df8c222e8c00b16add7ba37d3324b3c7
2022-01-11 07:36:23 +00:00
Ian Zerny
a52cbd67a3 Merge "Add mapping id to source file information for R8 full-mode builds." 2022-01-11 07:20:50 +00:00
Treehugger Robot
16213c6bbe Merge changes I9ad66ea2,I4c95b77b am: 57271b9f45 am: a7c0107744
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1934955

Change-Id: I46fa49c796cb2107df91bf7dad3878363e4e8274
2022-01-11 07:18:25 +00:00
TreeHugger Robot
2715e898c5 Merge "Revert "Add new property "exclude_files_in_output" for excluding files from the output files of Java related modules."" 2022-01-11 06:59:28 +00:00
Treehugger Robot
a7c0107744 Merge changes I9ad66ea2,I4c95b77b am: 57271b9f45
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1934955

Change-Id: Ia5c342a6bbf931be55dbe63d2609341f9d1a8da2
2022-01-11 06:57:18 +00:00
Treehugger Robot
57271b9f45 Merge changes I9ad66ea2,I4c95b77b
* changes:
  Make android_app.stem overridable
  Use 'stem' to override APK name
2022-01-11 06:38:25 +00:00
Treehugger Robot
86fe20aabe Merge "Consolidate conversions of is-board-platform(2)" am: 35f94eba51 am: e42453740a am: 2f2ec9f018 am: b252266b8a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1941101

Change-Id: Iabf22535b050effd72d0875e4e203a260ba36151
2022-01-11 05:54:42 +00:00
Treehugger Robot
b252266b8a Merge "Consolidate conversions of is-board-platform(2)" am: 35f94eba51 am: e42453740a am: 2f2ec9f018
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1941101

Change-Id: I4689c601028764e59756904cb29b7ca44700649a
2022-01-11 05:35:41 +00:00
Josh Wu
3964ce02ff Revert "Add new property "exclude_files_in_output" for excluding files from the output files of Java related modules."
This reverts commit 21f7ae0828.

Reason for revert: b/213966211

Change-Id: I697739697221d6f821eeda33a434cfcae9d651bf
2022-01-11 05:12:15 +00:00
Treehugger Robot
2f2ec9f018 Merge "Consolidate conversions of is-board-platform(2)" am: 35f94eba51 am: e42453740a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1941101

Change-Id: I1de90cc99db9f67188ce2eacd523bb77f57abde7
2022-01-11 05:08:06 +00:00
Keyi Gui
4ca4920558 Merge "Update droidstubs to support putting action inputs/outputs into the module-graph.json." am: f4bf09feba am: 23b9e124ee am: 9deb64462b am: ef93fb88fa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1940894

Change-Id: I350f71148aaae2509fb22f0cfd3767fd2509a7a7
2022-01-11 05:00:48 +00:00
Treehugger Robot
567ff88203 Merge "Convert math functions" am: 4cfd37e617 am: dafb404bd6 am: 47ae8c856a am: 045e13f624
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1940098

Change-Id: Ice0aafe796db08eb037b8c93d0c6a89d3278b1f7
2022-01-11 05:00:37 +00:00
Treehugger Robot
7d0b7f9d12 Merge "Make include_top comments only apply to the next statement" am: 03a0679529 am: 4d8ab7d1cc am: 25a6caab22 am: b37b719e8e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1940099

Change-Id: Ie326b2a1093e04242a0e701d89522fff25321235
2022-01-11 05:00:26 +00:00
Keyi Gui
ef93fb88fa Merge "Update droidstubs to support putting action inputs/outputs into the module-graph.json." am: f4bf09feba am: 23b9e124ee am: 9deb64462b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1940894

Change-Id: Ie3ded1577cc19bab2b0b4374a8f75f95691d8a78
2022-01-11 04:37:36 +00:00
Treehugger Robot
045e13f624 Merge "Convert math functions" am: 4cfd37e617 am: dafb404bd6 am: 47ae8c856a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1940098

Change-Id: I1729dbabb4afa33bb44645b73c7649b567b5a2a0
2022-01-11 04:37:25 +00:00