Commit graph

2159 commits

Author SHA1 Message Date
kgui
d7fda94073 Add JSON data related struct and function into context. am: 20f19a5d9b
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1942213

Change-Id: I823dfb5bb38234512ed96831dfaf1e7fff91e4e8
2022-01-11 03:43:05 +00:00
kgui
20f19a5d9b Add JSON data related struct and function into context.
Test: local test
Change-Id: I7a2000b458378f240cd6481066c15dec98d110ea
2022-01-10 14:55:06 +08:00
Treehugger Robot
b4d64a468d Merge "Reset contexts before calling LoadHook" am: 33132a4fd5 am: 360359e166 am: 7cbcb11dc5
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1934953

Change-Id: I1f394d07d665e78c95b371eac6bfc8d44fd27883
2022-01-06 02:14:43 +00:00
Treehugger Robot
7cbcb11dc5 Merge "Reset contexts before calling LoadHook" am: 33132a4fd5 am: 360359e166
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1934953

Change-Id: I3f89635e37a8efa76e33d411d6af1944f14b9e87
2022-01-06 01:57:53 +00:00
Treehugger Robot
360359e166 Merge "Reset contexts before calling LoadHook" am: 33132a4fd5
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1934953

Change-Id: I9821009ea7f975b80b97afd43c940b44cac810fe
2022-01-06 01:46:55 +00:00
Treehugger Robot
33132a4fd5 Merge "Reset contexts before calling LoadHook" 2022-01-06 01:31:00 +00:00
Lukacs T. Berki
b4a5e16e5a Allow soong_ui to set env vars for soong_build . am: a67610a75f am: d4493bb3be am: 80982062b5
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1934981

Change-Id: I03218e2ccf9e7046d6ec6371cc37fac05f59ff07
2022-01-05 13:17:37 +00:00
Lukacs T. Berki
80982062b5 Allow soong_ui to set env vars for soong_build . am: a67610a75f am: d4493bb3be
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1934981

Change-Id: Icb900111a23f7359a0a88f5d8e0c454053980184
2022-01-05 13:01:09 +00:00
Lukacs T. Berki
d4493bb3be Allow soong_ui to set env vars for soong_build . am: a67610a75f
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1934981

Change-Id: I13b0535c9a2091ab8badc89c6981c46992aa5c20
2022-01-05 12:48:55 +00:00
Inseob Kim
1e01a4e7c2 Reset contexts before calling LoadHook
If more than one loadhooks exist, calls to CreateModule will make an
error because the contexts object isn't reset and the same modules are
added more than once. This fixes the bug by initializing contexts object
every time.

Bug: 213297238
Test: manual
Change-Id: I545c1592c3217b764968a8937c962e9d58a85291
2022-01-05 19:56:08 +09:00
Lukács T. Berki
e931042a30 Merge "Set GODEBUG=asyncpreemptoff=1 for soong_build." am: 1a1ec4b59c am: 076697475f am: 517b1e44c4
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1933149

Change-Id: Ic0ebcbdae448d60aa286731b4c3222894b9a1210
2022-01-05 09:53:37 +00:00
Lukács T. Berki
517b1e44c4 Merge "Set GODEBUG=asyncpreemptoff=1 for soong_build." am: 1a1ec4b59c am: 076697475f
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1933149

Change-Id: Ic16caf68fb70f711c1dff2568dea575a30eda6e3
2022-01-05 09:33:48 +00:00
Lukacs T. Berki
a67610a75f Allow soong_ui to set env vars for soong_build .
This is used to make GODEBUG=asyncpreemptoff=1 only be set in debug mode
so that production is not affected.

Test: Presubmits.
Change-Id: Idb15ad20bb74ba3f896699715e3208c1287a5e82
2022-01-05 10:29:48 +01:00
Lukács T. Berki
076697475f Merge "Set GODEBUG=asyncpreemptoff=1 for soong_build." am: 1a1ec4b59c
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1933149

Change-Id: I9aa1f62c2a7c11e649b3be87e675e934f284615d
2022-01-05 09:23:03 +00:00
Lukács T. Berki
1a1ec4b59c Merge "Set GODEBUG=asyncpreemptoff=1 for soong_build." 2022-01-05 09:06:19 +00:00
Lukacs T. Berki
86c04818b4 Allow specifying the pool for soong_build calls. am: 3dab5143bd am: e039893e09 am: eecff1adbc
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1933151

Change-Id: I055549f3e16acad435bf641865c025a08a65717d
2022-01-05 08:38:52 +00:00
Lukacs T. Berki
eecff1adbc Allow specifying the pool for soong_build calls. am: 3dab5143bd am: e039893e09
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1933151

Change-Id: I7bca98832924dfe19ebfec5d84cb9ec795e4fc35
2022-01-05 08:23:10 +00:00
Lukacs T. Berki
e039893e09 Allow specifying the pool for soong_build calls. am: 3dab5143bd
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1933151

Change-Id: Icb0acaa96fb4ee514c42f9984a78105ab91d5118
2022-01-05 08:03:44 +00:00
Lukacs T. Berki
3dab5143bd Allow specifying the pool for soong_build calls.
Test: Presubmits.
Change-Id: Iff0edf595b1868ccdda4ea6391c1057e0f86cd9b
2022-01-04 14:49:54 +01:00
Lukacs T. Berki
635fc35a09 Set GODEBUG=asyncpreemptoff=1 for soong_build.
This makes debugging with Delve much faster, sometimes by an order of
magnitude because Delve does not have to deal with the many SIGURG
signals that are used to stop preempted goroutines this way.

This could in theory result in a performance loss, but running
`rm -f out/soong/build.ninja; time m nothing` five times demonstrated no
change in the execution time.

Test: Presubmits + performance testing as described above.
Change-Id: I438564bcaf70d2a50147cf54cdfac6dcfe925ce5
2022-01-04 12:37:24 +01:00
Yi Kong
fde2f48e77 Apply toNinjaName for variant names am: a08e722192 am: 824c042a1c am: 413c480f6e
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1927227

Change-Id: Ic197aea765c8e03bcaf1377c188c0ef5693d417f
2021-12-22 07:51:41 +00:00
Yi Kong
413c480f6e Apply toNinjaName for variant names am: a08e722192 am: 824c042a1c
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1927227

Change-Id: I3625f09d70a226babe7b3d5af5116e99cc8c9938
2021-12-22 07:36:31 +00:00
Yi Kong
824c042a1c Apply toNinjaName for variant names am: a08e722192
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1927227

Change-Id: Ifb4b0521a6d9aab5628bb52aad589a332164198b
2021-12-22 07:18:56 +00:00
Yi Kong
a08e722192 Apply toNinjaName for variant names
Variant names are part of the name of the generated Ninja rule.
toNinjaName needs to be applied to it as well.

Test: presubmit
Change-Id: I4fb908b6824179440b1c207240bad59dc85009fa
2021-12-22 13:35:02 +08:00
Dan Willemsen
acf5dae120 Support go1.18, drop support for <go1.8 am: 6dd6868dec am: 63279c6fd0 am: fbd6067617
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1923364

Change-Id: I704b4a178904a019911dfaa5f3d35255fbc1c46f
2021-12-15 02:18:11 +00:00
Dan Willemsen
fbd6067617 Support go1.18, drop support for <go1.8 am: 6dd6868dec am: 63279c6fd0
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1923364

Change-Id: I57915103e2e6ba2fa3cc934ba89d77ea6ef2c2ef
2021-12-15 01:57:10 +00:00
Dan Willemsen
63279c6fd0 Support go1.18, drop support for <go1.8 am: 6dd6868dec
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1923364

Change-Id: Idd41d4bfbc32f36677443c505011804e308d38bc
2021-12-15 01:41:47 +00:00
Dan Willemsen
6dd6868dec Support go1.18, drop support for <go1.8
Change-Id: I676aabbd7173e6ae523e6fcedfaafcd44ba85c3a
2021-12-14 15:58:35 -08:00
Colin Cross
9e5a6be83f Merge "Add NinjaAndshellEscapeListIncludingSpaces" am: 1527beef42 am: a0ec53a770 am: 362b9abf72
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1899704

Change-Id: I166587d3f2ecf59607b22aafef2d9c423d45ab32
2021-12-10 22:42:17 +00:00
Colin Cross
362b9abf72 Merge "Add NinjaAndshellEscapeListIncludingSpaces" am: 1527beef42 am: a0ec53a770
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1899704

Change-Id: Ia29b62bf7d7aebd3f9f3486bb37a4ea8f374f53e
2021-12-10 22:20:35 +00:00
Colin Cross
a0ec53a770 Merge "Add NinjaAndshellEscapeListIncludingSpaces" am: 1527beef42
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1899704

Change-Id: I7308e2e2c505df3c4d1d1d018a3aa57ed7de1d79
2021-12-10 22:04:40 +00:00
Colin Cross
1527beef42 Merge "Add NinjaAndshellEscapeListIncludingSpaces" 2021-12-10 21:43:49 +00:00
Jingwen Chen
ed30b8ceb1 Forward descriptions to primary build invocations. am: 8e7786a0fd am: 1f77f7af15 am: 629b9fa603
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1911018

Change-Id: Ibc13f2600b10544dfbdc429c82e557a8a55f8d74
2021-12-07 02:00:18 +00:00
Jingwen Chen
629b9fa603 Forward descriptions to primary build invocations. am: 8e7786a0fd am: 1f77f7af15
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1911018

Change-Id: I2ecff8961e150412f45ddcb11b61c606f7bfef73
2021-12-07 01:46:18 +00:00
Jingwen Chen
1f77f7af15 Forward descriptions to primary build invocations. am: 8e7786a0fd
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1911018

Change-Id: Ic7edf1773d6c017c687d48ed6e9ef84d9f30cb64
2021-12-07 01:31:20 +00:00
Jingwen Chen
8e7786a0fd Forward descriptions to primary build invocations.
Test: m nothing bp2build json-module-graph queryview soong_docs
Change-Id: Ic64238dc10a90c923cf5559d1bbbc51fd0922e31
2021-12-06 13:30:18 +00:00
Usta
f5693736a2 Minor refactoring to remove a couple of warnings am: 5ff5fe3e66 am: 31b232ba4b am: a526ba483f
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1909474

Change-Id: Ifed24dc86ab6342a13d62dfa3a0f8eadcea9ef70
2021-12-02 22:22:55 +00:00
Usta
a526ba483f Minor refactoring to remove a couple of warnings am: 5ff5fe3e66 am: 31b232ba4b
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1909474

Change-Id: Icdb4232ca3a22f92247c6210abc2eaf5ad439b0b
2021-12-02 22:10:10 +00:00
Usta
31b232ba4b Minor refactoring to remove a couple of warnings am: 5ff5fe3e66
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1909474

Change-Id: I1982017e263f44844514b8e5d00af28f47d3ff51
2021-12-02 21:54:52 +00:00
Usta
5ff5fe3e66 Minor refactoring to remove a couple of warnings
Test: m nothing
Bug: n/a

Change-Id: I3d5cf50974e84725d1d49113dfb9b74d4f426fb8
2021-12-02 15:21:59 -05:00
Colin Cross
97eda8939b Add NinjaAndshellEscapeListIncludingSpaces
Add a method that ninja and shell escapes each entry in a list
of strings as a single argument.

Test: escape_test.go
Change-Id: Iac05c64f1ae48cd6186f563790ea49b90618038d
2021-11-22 22:45:54 -08:00
TreeHugger Robot
9c4930ddf3 [automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: fd0aed5f2c -s ours am: fbc5296fc0 -s ours
am skip reason: Merged-In Ide155fbc4b2a982177f4082d6a27d05ddc9bd675 with SHA-1 10ef8ee70c is already in history

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

Change-Id: I4a931e526fde548049ba7ca06e346f30ea27f35f
2021-11-17 19:54:13 +00:00
TreeHugger Robot
fbc5296fc0 [automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: fd0aed5f2c -s ours
am skip reason: Merged-In Ide155fbc4b2a982177f4082d6a27d05ddc9bd675 with SHA-1 10ef8ee70c is already in history

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

Change-Id: Ie95eeb0765c52fa42698ce87b101f7d33e753419
2021-11-17 19:36:54 +00:00
TreeHugger Robot
fd0aed5f2c Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master 2021-11-17 19:24:11 +00:00
Liz Kammer
c3e6a6f229 Add ShellEscapeListIncludingSpaces am: 3a988df18a am: 4a7a93e620 am: f78b492e23
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1894576

Change-Id: I5a4ff115332d913a05370bfccbdc527583ee9825
2021-11-17 02:14:52 +00:00
Liz Kammer
f78b492e23 Add ShellEscapeListIncludingSpaces am: 3a988df18a am: 4a7a93e620
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1894576

Change-Id: I8838ccf45808027ff9cf564ba7f0a8186dcfdb45
2021-11-17 02:02:10 +00:00
Liz Kammer
4a7a93e620 Add ShellEscapeListIncludingSpaces am: 3a988df18a
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1894576

Change-Id: Ibdd319237ef5dd125279ea14fa1d84f53e3d0fcb
2021-11-17 01:46:05 +00:00
Liz Kammer
3a988df18a Add ShellEscapeListIncludingSpaces
This simplifies escaping for aquery.

Test: build/bazel/ci/mixed_droid.sh
Change-Id: I88356a8eda0c6a6ac9426d37cd386f0a94b8818b
2021-11-16 17:17:02 -05:00
Lukacs T. Berki
5a4b1ac499 Move bpglob to outside of the Ninja action graph. am: 6fbc68d41d am: ffa095e33e am: 47f1fb8fb6 am: e40adf699a
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1879698

Change-Id: I1dc1ef2cb8b3be4ea8e1e8aba536dd44469e2d50
2021-11-10 18:10:02 +00:00
Lukacs T. Berki
e40adf699a Move bpglob to outside of the Ninja action graph. am: 6fbc68d41d am: ffa095e33e am: 47f1fb8fb6
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1879698

Change-Id: Ie989c6fe4d07055164212c2d13b1ae31bb489faa
2021-11-10 17:53:18 +00:00