StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
43,801 Commits 1 Branch 0 Tags
2b8c5cd3655f9931f87bb55022f1757d049eb92c
Commit Graph

43801 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colin Cross
2b8c5cd365 Filter srcjars out of srcFiles am: b0ef30ab4a am: 5da98c1c34 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1751182

Change-Id: I2bba227d8994d0da177829e19613a1f6134b0c6c
 2021-06-30 18:12:47 +00:00
Colin Cross
5da98c1c34 Filter srcjars out of srcFiles am: b0ef30ab4a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1751182

Change-Id: I162e10cf7455d2a3cee94b5a4e689d0321e677b6
 2021-06-30 17:49:53 +00:00
Anton Hansson
b648bc755c Merge "Remove kati marker in soong-only build" am: e6266e04f5 am: 5152ed29f1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1741174

Change-Id: Id49ae89d1106c36240508af19aac0656634ff105
 2021-06-30 10:03:50 +00:00
Anton Hansson
5152ed29f1 Merge "Remove kati marker in soong-only build" am: e6266e04f5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1741174

Change-Id: I6dcb77617126e7eb4f8b894e17e480f291828f6a
 2021-06-30 09:51:42 +00:00
Anton Hansson
e6266e04f5 Merge "Remove kati marker in soong-only build" 2021-06-30 09:33:49 +00:00
Treehugger Robot
48cb07a176 [automerger skipped] Merge "Ignore license and similar dependencies of prebuilt_apex/apex_set" am: 49387d5468 am: 20f9907a46 -s ours 
am skip reason: Merged-In Iead6f9d1085d169335b88ceadcce2d8cc042254d with SHA-1 fee8cf36e3 is already in history

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

Change-Id: I8dd3bb22dd86330137a1dc3411f0c1c17950914a
 2021-06-30 00:42:03 +00:00
Treehugger Robot
20f9907a46 Merge "Ignore license and similar dependencies of prebuilt_apex/apex_set" am: 49387d5468 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1748052

Change-Id: I0816a42b23e10b0acc99723706fc8af292c288a6
 2021-06-30 00:36:59 +00:00
Colin Cross
cd872b7e1f Merge "Reland "Consistently prepend arch-specific headers"" am: dd8b6911ac am: 90e658ef14 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1750981

Change-Id: I686a8ded670229c6fff2c6f7d91d75346e6a6f96
 2021-06-30 00:30:42 +00:00
Colin Cross
90e658ef14 Merge "Reland "Consistently prepend arch-specific headers"" am: dd8b6911ac 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1750981

Change-Id: I21a16b3618278fcfcb7a6805d565005ea7ff4988
 2021-06-30 00:30:29 +00:00
Filip
1983f4389f Consistent soong namescape example am: 87112d6aca am: d4b249ae2b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1751548

Change-Id: I7116aec9006fce069439b6991ab20dc5e547a15e
 2021-06-30 00:30:25 +00:00
Treehugger Robot
49387d5468 Merge "Ignore license and similar dependencies of prebuilt_apex/apex_set" 2021-06-30 00:25:39 +00:00
Colin Cross
dd8b6911ac Merge "Reland "Consistently prepend arch-specific headers"" 2021-06-30 00:19:56 +00:00
Filip
d4b249ae2b Consistent soong namescape example am: 87112d6aca 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1751548

Change-Id: I6b4ac17e08367a9383a528dd6a1ac6f20275f800
 2021-06-30 00:14:34 +00:00
Paul Duffin
46ab291f67 Ignore license and similar dependencies of prebuilt_apex/apex_set 
Previously, when determining which dependencies, direct or transitive,
of a prebuilt_apex/apex_set required APEX variants the code assumed
that all dependencies implemented ApexModule. While that is true for
the modules that can be explicitly mentioned in the exported...
properties it is not true for all of them. e.g. A
prebuilt_apex/apex_set can depend on license modules which do not
implement ApexModule.

This change simply ignores any module that does not implement
ApexModule.

Bug: 179354495
Test: m nothing
Merged-In: Iead6f9d1085d169335b88ceadcce2d8cc042254d
Change-Id: Iead6f9d1085d169335b88ceadcce2d8cc042254d
(cherry picked from commit fee8cf36e3)
 2021-06-30 00:08:49 +01:00
Paul Duffin
d7be777f25 Ignore license and similar dependencies of prebuilt_apex/apex_set am: fee8cf36e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15132673

Change-Id: I88690c5637ab0e3a67415afa19fcfef0707b2b78
 2021-06-29 23:06:29 +00:00
Filip
87112d6aca Consistent soong namescape example 
Test: not required - documentation change

Change-Id: Ib487278e7ca183fd968df70fb701a8cdf7266c19
 2021-06-29 21:25:30 +00:00
Pirama Arumuga Nainar
0979b85da5 Merge "[scripts] Add script to print clang prebuilts version" am: 54f92016bc am: d07ab01aa8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1747714

Change-Id: I4f64d8f7eb976a8dcc6148b80538b95d7fadcd1b
 2021-06-29 19:51:36 +00:00
Pirama Arumuga Nainar
d07ab01aa8 Merge "[scripts] Add script to print clang prebuilts version" am: 54f92016bc 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1747714

Change-Id: I2220b17dc229849f50733b50f0e5e2a033719335
 2021-06-29 19:37:15 +00:00
Pirama Arumuga Nainar
54f92016bc Merge "[scripts] Add script to print clang prebuilts version" 2021-06-29 18:29:09 +00:00
Colin Cross
b0ef30ab4a Filter srcjars out of srcFiles 
srcFiles is passed to Lint, and given it both the srcjars and the
expanded sources from the srcjars confuses it about which files are
generated.  Remove srcjars from srcFiles after handling them.

Bug: 192245952
Test: m lint-check
Change-Id: Ic57d1c623f4cac7cd79f1342bac4b51bd2535ac3
 2021-06-29 10:43:57 -07:00
Paul Duffin
fee8cf36e3 Ignore license and similar dependencies of prebuilt_apex/apex_set 
Previously, when determining which dependencies, direct or transitive,
of a prebuilt_apex/apex_set required APEX variants the code assumed
that all dependencies implemented ApexModule. While that is true for
the modules that can be explicitly mentioned in the exported...
properties it is not true for all of them. e.g. A
prebuilt_apex/apex_set can depend on license modules which do not
implement ApexModule.

This change simply ignores any module that does not implement
ApexModule.

Bug: 179354495
Test: m nothing
Change-Id: Iead6f9d1085d169335b88ceadcce2d8cc042254d
 2021-06-29 18:42:55 +01:00
Anton Hansson
17fc5a03da Remove kati marker in soong-only build 
Previously we ensured the kati marker exists in kati-enabled builds, but
did not ensure the kati marker didn't exist in non-kati-enabled builds,
resulting in soong thinking kati would run after it when it would not.

Also change the condition to only create the kati_enabled marker if we
don't skip kati or kati ninja.

Bug: 189187214
Test: m nothing && soong_ui --make-mode --soong-only && verify
      kati_enabled marker is gone
Change-Id: If196b194b6aee38e9d4135889a4a4048ee5add82
 2021-06-29 15:17:36 +01:00
Treehugger Robot
b438f74ea7 Merge "Add test for empty stub generation." am: 22fd032ccb am: 0dfaf6eda0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1670427

Change-Id: I5aa574502f614acb804bf864cf367647e8778348
 2021-06-29 01:12:47 +00:00
Treehugger Robot
0dfaf6eda0 Merge "Add test for empty stub generation." am: 22fd032ccb 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1670427

Change-Id: Ie3c7ca0fa77fb6cb36d650d8217d53661f77bc84
 2021-06-29 00:57:27 +00:00
Colin Cross
0ed579efd9 Reland "Consistently prepend arch-specific headers" 
This reverts commit cacb972dcd.

Relanding along with one more fix in prebuilts/ndk

Change-Id: I65cbc3c5d72bb47bd00e123c63911c9baa1e5f03
Test: m checkbuild
 2021-06-29 00:51:12 +00:00
Treehugger Robot
22fd032ccb Merge "Add test for empty stub generation." 2021-06-29 00:42:49 +00:00
Colin Cross
a11e79e340 Merge "Revert "Consistently prepend arch-specific headers"" am: e86698f28a am: 0e288ad9e8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1748122

Change-Id: I8d6c272d1d7ee4ad18f558b643d9e42ecfdda77c
 2021-06-29 00:20:36 +00:00
Treehugger Robot
1a02146ca9 Merge "Add libs to debuggable" am: 3b90bb9834 am: 3835adce04 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1744764

Change-Id: Id7c43d2e29aaba652016dd9cd7cbce47dcd2161c
 2021-06-29 00:20:16 +00:00
Colin Cross
0e288ad9e8 Merge "Revert "Consistently prepend arch-specific headers"" am: e86698f28a 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1748122

Change-Id: Ibeba5d84fea6799a35900ee5b40d8ee9bf023b56
 2021-06-29 00:09:48 +00:00
Treehugger Robot
3835adce04 Merge "Add libs to debuggable" am: 3b90bb9834 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1744764

Change-Id: I9e6b7287f7158bf4f9b4227115e02ab140106533
 2021-06-29 00:08:27 +00:00
Colin Cross
e86698f28a Merge "Revert "Consistently prepend arch-specific headers"" 2021-06-28 23:59:48 +00:00
Colin Cross
cacb972dcd Revert "Consistently prepend arch-specific headers" 
This reverts commit e945a4d212.

Reason for revert: broke full-eng checkbuild

Change-Id: I0036fed96aa727b63c16982151fd661923e77e59
 2021-06-28 23:58:59 +00:00
Treehugger Robot
3b90bb9834 Merge "Add libs to debuggable" 2021-06-28 23:58:12 +00:00
Colin Cross
38ed84db72 Merge "Consistently prepend arch-specific headers" am: 99f5cc002b am: 5fc69c34ef 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1734116

Change-Id: I1b071176ab3428d7266285643080c46dbc5062b6
 2021-06-28 23:27:03 +00:00
Colin Cross
5fc69c34ef Merge "Consistently prepend arch-specific headers" am: 99f5cc002b 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1734116

Change-Id: Ib2f7fa22ffc33ccf3f5acd6c86aad22e963cb518
 2021-06-28 23:13:06 +00:00
Colin Cross
99f5cc002b Merge "Consistently prepend arch-specific headers" 2021-06-28 22:55:35 +00:00
Dan Albert
08327ac7fc Add test for empty stub generation. 
Seems this works, but adding the test anyway.

Test: pytest
Bug: None
Change-Id: I32903246a037f942e87b35479d07a8f30853f9e4
 2021-06-28 15:50:55 -07:00
Yifan Hong
8f323ae364 Add libs to debuggable 
Test: pass
Bug: 190868302
Change-Id: Ia51d9bb97d2f413b515335534cd5a771da68ce4b
 2021-06-28 15:39:55 -07:00
Treehugger Robot
ba0b3bb665 Merge changes I5823fdb5,I3e44c137 am: 26999937e2 am: 46d7b4d06f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1749115

Change-Id: I2cbc753efa5c44c693414f9e7db7a48174065bbb
 2021-06-28 20:07:44 +00:00
Treehugger Robot
46d7b4d06f Merge changes I5823fdb5,I3e44c137 am: 26999937e2 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1749115

Change-Id: I835125d7cbdbbce78e67ce9929a3b392e7be45f4
 2021-06-28 19:53:34 +00:00
Ivan Lozano
dad6cbf8fd Merge "rust: Add missing Rust allow path modules." am: 6eb16f8f87 am: d3fe989fb5 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1749781

Change-Id: I1a571a572f6e1f019ae6b86165d07c7f7afaabb5
 2021-06-28 19:39:01 +00:00
Treehugger Robot
26999937e2 Merge changes I5823fdb5,I3e44c137 
* changes:
  Tag android_app_import's apk as `android:"path"`
  genrule supports OutputFileProducer
 2021-06-28 19:31:59 +00:00
Ivan Lozano
d3fe989fb5 Merge "rust: Add missing Rust allow path modules." am: 6eb16f8f87 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1749781

Change-Id: I1ba3008f771954183d50f98d6138e79e3de3c196
 2021-06-28 19:24:33 +00:00
Ivan Lozano
6eb16f8f87 Merge "rust: Add missing Rust allow path modules." 2021-06-28 19:05:51 +00:00
Colin Cross
59e07742ae Merge changes I7fdc1f53,I422315f0,Ia34b80d9 am: 7061f79228 am: f801962f0e 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1743042

Change-Id: Ie88788ea3f287356c3eb1c988eb3e2020854692c
 2021-06-28 17:40:32 +00:00
Colin Cross
f801962f0e Merge changes I7fdc1f53,I422315f0,Ia34b80d9 am: 7061f79228 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1743042

Change-Id: If88029a7dab238d560fa549efa3993acc71bb659
 2021-06-28 17:24:10 +00:00
Paul Duffin
76aeb124d5 [automerger skipped] Calculate widest stub dex jars per module am: fb8f07bc0e -s ours 
am skip reason: Merged-In Ib137825ebffe94b2bf220732bae6077f7b7ac6db with SHA-1 280a31aac3 is already in history

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

Change-Id: Ie4a99e44a3466fb69f6835664db5a36c40159164
 2021-06-28 17:19:23 +00:00
Colin Cross
7061f79228 Merge changes I7fdc1f53,I422315f0,Ia34b80d9 
* changes:
  Move default crt objects into Toolchain
  Add DefaultSharedLibraries to Toolchain
  Create toolchainBionic for the various bionic-based toolchains to inherit from
 2021-06-28 17:08:10 +00:00
Jooyung Han
f05ca9c0ea Tag android_app_import's apk as android:"path" 
Now, android_app_import can use apk from other modules like genrule.

Bug: 192200378
Test: m com.android.compos
Change-Id: I5823fdb53b6aa20bfd9ec4dd16aafe63e65b6b68
 2021-06-29 02:07:24 +09:00
Jooyung Han
8c7e3ed786 genrule supports OutputFileProducer 
And when genrule generates multiple output files, tag can be used to
choose a single output file.

Bug: 192200378
Test: soong test
Change-Id: I3e44c137ad95468616ab883d3b277593cd82d1e8
 2021-06-29 02:07:17 +09:00