StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,564 Commits 1 Branch 0 Tags
9679be9ea5b9e60f652beab8977397bd11637a7f
Commit Graph

34564 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Duffin
9679be9ea5 Merge "Fix app tests to work without javaMockFS()" am: e26e597fc8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634633

Change-Id: I045684237af489507cc6436b760c41e94dac8bce
 2021-03-18 08:17:36 +00:00
Paul Duffin
85bcdfcb3c Merge "Convert app tests that depend on javaMockFS() to test fixtures" am: 9e993c6162 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634632

Change-Id: I6fdf8082b84ad606534b332867e274829a3f969e
 2021-03-18 08:17:26 +00:00
Paul Duffin
3e2173905d Merge "Convert TestUsesLibraries to test fixtures" am: 8a6fef4db3 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634631

Change-Id: I9845d1bc4e2e1b8663d8d6c1fc982c4741c7b672
 2021-03-18 08:17:17 +00:00
Lukács T. Berki
85787f8720 Merge "Fix writing soong.variables ." am: 828b1e99ec 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1641405

Change-Id: I80ae7c3fa8209791444ded7e611864ecc36c9256
 2021-03-18 08:16:37 +00:00
Paul Duffin
e26e597fc8 Merge "Fix app tests to work without javaMockFS()" 2021-03-18 08:00:29 +00:00
Paul Duffin
9e993c6162 Merge "Convert app tests that depend on javaMockFS() to test fixtures" 2021-03-18 07:59:54 +00:00
Paul Duffin
8a6fef4db3 Merge "Convert TestUsesLibraries to test fixtures" 2021-03-18 07:59:04 +00:00
Lukács T. Berki
828b1e99ec Merge "Fix writing soong.variables ." 2021-03-18 07:36:53 +00:00
Pirama Arumuga Nainar
638bcda667 Merge "Update clang used for bindgen to clang-r412851" am: 5ef0c52bdf 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642782

Change-Id: I373a80062d2f81ac12dbeae07d459e03255a02d2
 2021-03-18 00:43:38 +00:00
Pirama Arumuga Nainar
5ef0c52bdf Merge "Update clang used for bindgen to clang-r412851" 2021-03-18 00:27:30 +00:00
Jiyong Park
dd945e2f0e Merge "Add vbmeta module type" am: e7569bc544 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1636160

Change-Id: I9e2b1e495d021e151f10c59ec391b0c29608ea92
 2021-03-18 00:04:55 +00:00
Treehugger Robot
dfda472219 Merge "bootimg signs image using verity_utils" am: ab534a3b5c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1636159

Change-Id: I462d69aaf03aa6c0c0e98269b2696ca58948e959
 2021-03-18 00:04:06 +00:00
Jiyong Park
e7569bc544 Merge "Add vbmeta module type" 2021-03-18 00:02:41 +00:00
Treehugger Robot
ab534a3b5c Merge "bootimg signs image using verity_utils" 2021-03-17 23:37:04 +00:00
Pirama Arumuga Nainar
7b33d41170 Update clang used for bindgen to clang-r412851 
Test: presubmit
Change-Id: I4883bd3c26a4037d01829c0806fc908b2c8e1c37
 2021-03-17 10:37:51 -07:00
Lukacs T. Berki
720b3964fe Fix writing soong.variables . 
ConfiguredJarList had a marshaler but no unmarshaler.

Bug: 182965747
Test: Presubmits.
Change-Id: Id03669f4a0a3d389063a4e4b11af6d6be63dbba3
 2021-03-17 16:35:13 +01:00
Colin Cross
c9332b4aa5 Merge changes from topic "rule_builder_rsp" am: 45a4971808 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634805

Change-Id: I881fee324890675467a45c88adc8c7537da6dd9d
 2021-03-17 15:31:21 +00:00
Colin Cross
37225a7b05 Add explicit rspfile argument to RuleBuilderCommand.FlagWithRspFileInputList am: 70c4741215 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634804

Change-Id: Id1d3d6b1047f0492eaa88ada521dd8c4cdb22670
 2021-03-17 15:31:16 +00:00
Colin Cross
1606582da1 Ninja escape RuleBuilder rule params am: 4502978bee 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1640628

Change-Id: I16d78d4b3c5810c1a34835cd96164a3c58dd67fc
 2021-03-17 15:30:46 +00:00
Colin Cross
45a4971808 Merge changes from topic "rule_builder_rsp" 
* changes:
  Remove unescaped spans support from RuleBuilder
  Add explicit rspfile argument to RuleBuilderCommand.FlagWithRspFileInputList
  Ninja escape RuleBuilder rule params
 2021-03-17 15:14:19 +00:00
Paul Duffin
2645a2912f Fix app tests to work without javaMockFS() 
Bug: 182638834
Test: m nothing
Change-Id: Ia1815557e6d9dba1cb24f824a988c7599263bf85
 2021-03-17 14:01:02 +00:00
Paul Duffin
cdb88a996a Convert app tests that depend on javaMockFS() to test fixtures 
Bug: 182638834
Test: m nothing
Change-Id: Ice668cf58695839d4929a0744822c0ded441d9c4
 2021-03-17 14:01:02 +00:00
Paul Duffin
d234b418a5 Convert TestUsesLibraries to test fixtures 
This test relies on files provided by javaMockFS() so has been
converted to test fixtures to allow it to remove that dependency which
will allow javaMockFS() to be removed.

Bug: 182638834
Test: m nothing
Change-Id: I77b0205c91ff94b1c3c9ca00d4711451e3671571
 2021-03-17 14:01:02 +00:00
Lukacs T. Berki
a93b414edc Remove GeneratingPrimaryBuilder(). am: d7ce8402d8 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1636427

Change-Id: Ifcd4f1eae242de68942da39ebfc6c9875698c6b9
 2021-03-17 13:33:13 +00:00
Lukács T. Berki
b32ec546a1 Merge "Embed minibp into soong_ui." am: 059972c214 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1636426

Change-Id: I494cce221eee33df007ef0974b5c07b2d550edad
 2021-03-17 13:32:25 +00:00
Lukacs T. Berki
d7ce8402d8 Remove GeneratingPrimaryBuilder(). 
It's replaced with a flag in bootstrap.Args .

Test: "m nothing" (presubmits take a full workday these days)
Change-Id: Ia0bfa2091013e389890e583c559006077806af99
 2021-03-17 14:08:50 +01:00
Lukács T. Berki
059972c214 Merge "Embed minibp into soong_ui." 2021-03-17 12:54:18 +00:00
Treehugger Robot
e3fd959661 Merge "Run InitAndroidArchModule last in factory functions." am: 797b03eec9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1641400

Change-Id: Ic4717820f04cc88ca8888d34b03cae789cc52fef
 2021-03-17 11:48:03 +00:00
Treehugger Robot
797b03eec9 Merge "Run InitAndroidArchModule last in factory functions." 2021-03-17 11:07:13 +00:00
Lukács T. Berki
98717b621c Merge "Remove global variables from Blueprint." am: 645610e791 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629620

Change-Id: Ib3d44ccde559f61758d6e7e4e841f3e171d19aaf
 2021-03-17 07:38:29 +00:00
Lukacs T. Berki
d1e3f1ff08 Embed minibp into soong_ui. 
This requires linking Blueprint into soong_ui. It lets us avoid the
complicated dance of Ninja files and shell scripts: now the information
as to how soong_build is built is passed directly to Blueprint using a
struct that contains all the information the command line arguments used
to contain.

The ability to run Blueprint from the command line is kept (for now).

Some variables in bootstrap/command.go needed public accessor functions
because soong_build reads them. This will be disentangled by moving the
flag parsing to soong_build.

The presence of the flag definitions in Blueprint means that soong_ui
now also accepts them. This is not a problem in practice because they
are ignored and because soong_ui itself is hidden behind a few layers of
shell scripts.

Test: Presubmits + the new bootstrap_test.sh .
Change-Id: I6dca478f356f56a8aee1e457d71439272351390b
 2021-03-17 08:35:52 +01:00
Lukács T. Berki
645610e791 Merge "Remove global variables from Blueprint." 2021-03-17 07:08:24 +00:00
Yuexi Ma
b2bfff678e Merge "Export a few utility methods" am: b96a04ba49 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1620219

Change-Id: Id2ff7ae6bf144abbcae1c5492d59ffcbc0b8c9fb
 2021-03-17 02:25:07 +00:00
Yuexi Ma
b96a04ba49 Merge "Export a few utility methods" 2021-03-17 01:40:51 +00:00
Martin Stjernholm
b79c7f1101 Run InitAndroidArchModule last in factory functions. 
It calls InitAndroidModule which retrieves the properties, so all
AddProperties must go before it.

Test: `m nothing` with new ART prebuilt drop that has a
  prebuilt_boot_image module.
Bug: 177892522
Change-Id: Ia09db9ef17148d36d8d4f25df3f1bf4f528a2fc8
 2021-03-17 00:31:15 +00:00
Treehugger Robot
c7a7d6e589 Merge "Fix removing partial zip file on error" am: eb32d6c2a6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1638102

Change-Id: Ie6f3f77ed93cc795dc3bc6d65327682b3513fecd
 2021-03-17 00:11:57 +00:00
Colin Cross
b70a1a900a Remove unescaped spans support from RuleBuilder 
Now that rsp files use an explicit path instead of $out.rsp the
unescaped spans and NinjaEscapedCommands() support can be removed
from RuleBuilder.

Bug: 182612695
Test: rule_builder_test.go
Change-Id: I6705151ff0528c59aa1af56ee52c294da15a7a66
 2021-03-16 16:53:20 -07:00
Colin Cross
70c4741215 Add explicit rspfile argument to RuleBuilderCommand.FlagWithRspFileInputList 
Using $out.rsp as the rsp file adds extra complexity around keeping
the $ unescaped.  Make callers to FlagWithRspFileInputList provide
an explicit path for the rsp file instead.

Bug: 182612695
Test: rule_builder_test.go
Change-Id: I3f531d80c1efa8a9d09aac0a63790c5b11a9f0c6
 2021-03-16 16:52:56 -07:00
Colin Cross
4502978bee Ninja escape RuleBuilder rule params 
The CommandDeps and Rspfile properties can contain arbitrary paths
that may need ninja escaping.

Bug: 182612695
Test: genrule_test.go
Change-Id: I1426e9dfeab3bde9f65b61d0c47840f97c1c7526
 2021-03-16 16:52:54 -07:00
Treehugger Robot
eb32d6c2a6 Merge "Fix removing partial zip file on error" 2021-03-16 23:46:53 +00:00
Christian Wailes
ae3f51b415 Merge "Add test suite to legacy core platform allowlist." am: 7d1f1cf27c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1634799

Change-Id: I562ae1aaa6421be7b1cf43fbd91870beb12652da
 2021-03-16 23:16:42 +00:00
Christian Wailes
7d1f1cf27c Merge "Add test suite to legacy core platform allowlist." 2021-03-16 23:02:39 +00:00
Yuexi Ma
627263fece Export a few utility methods 
Add a few utility methods to support generating TradeFed test plan in C-Suite

Test: go test .
Change-Id: I86a505068b5d5aa0f5a37b3e3a2465839a7480ef
 2021-03-16 15:57:59 -07:00
Liz Kammer
f84f690929 Merge "Temporarily disable cc_objects in mixed builds" am: 39d3830205 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1640582

Change-Id: I7097cbeda45737ebec339ec4d4a51f4ea3d3fa7d
 2021-03-16 21:54:54 +00:00
Liz Kammer
2b6af78207 Merge changes from topic "mixed-bp2build" am: a5f86249a4 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1607554

Change-Id: Ife9676229ca007e495bf9ed54d877f4d2cb3b9ea
 2021-03-16 21:54:50 +00:00
Jaewoong Jung
b163cc04ce Merge "Improve java.go readability." am: 9f315dea28 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1627239

Change-Id: I6194d9aec2579cad62d497298c888d35f3d70cff
 2021-03-16 21:54:34 +00:00
Christopher Parsons
70f670df1a Merge "Refactor and cleanup of cquery processing" am: bc3f7e0276 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1629139

Change-Id: I547f447372fbc4b40e72eef2d4f9f9c72fef47e6
 2021-03-16 21:53:42 +00:00
Liz Kammer
39d3830205 Merge "Temporarily disable cc_objects in mixed builds" 2021-03-16 21:40:04 +00:00
Liz Kammer
a5f86249a4 Merge changes from topic "mixed-bp2build" 
* changes:
  Support autoconverted modules in mixed builds
  Use handcrafted build targets in bp2build
 2021-03-16 21:40:04 +00:00
Jaewoong Jung
9f315dea28 Merge "Improve java.go readability." 2021-03-16 21:32:48 +00:00