Commit graph

1896 commits

Author SHA1 Message Date
Lukacs T. Berki
1ff903cbac Remove PrimaryBuilderExtraFlags and cull Args. am: 5d5ed5fc6b am: 32d5d542d2
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1819862

Change-Id: I4ab64174835c7ac9bf895b193142fbd0f5fc0306
2021-09-08 13:53:13 +00:00
Lukacs T. Berki
159abd0cf6 Prefix file names with ctx.SrcDir() in docgen. am: 70d6564d7d am: 2339404d67
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1821452

Change-Id: I665f4e4d5e5f18c5060d5e5a90e39a5bbf01e748
2021-09-08 13:53:12 +00:00
Lukacs T. Berki
32d5d542d2 Remove PrimaryBuilderExtraFlags and cull Args. am: 5d5ed5fc6b
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1819862

Change-Id: I3c220d3d23862dd7c75e19a5c4c8ee999c275bb9
2021-09-08 13:39:21 +00:00
Lukacs T. Berki
2339404d67 Prefix file names with ctx.SrcDir() in docgen. am: 70d6564d7d
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1821452

Change-Id: I910765324c5ec7bb9a8aafc23fee304b82f456ca
2021-09-08 13:39:19 +00:00
Lukacs T. Berki
5d5ed5fc6b Remove PrimaryBuilderExtraFlags and cull Args.
PrimaryBuilderExtra flags was only used from soong_ui and has nothing to
do with Blueprint files or modules and Args contained a lot of members
that were likewise only used for plumbing withing soong_ui or for
command line processing for soong_build.

Test: Presubmits.
Change-Id: Ibf009e446b4044309a331592a88a4aa86b4801e3
2021-09-08 09:35:56 +02:00
Lukacs T. Berki
70d6564d7d Prefix file names with ctx.SrcDir() in docgen.
This is because docgen will be called from the bootstrap Ninja file with
cwd == /.

Side cleanup: remove an unused template.

Test: Presubmits.
Change-Id: Ia5ff10247becbabc7a76c21f4ed05d654a7b20c3
2021-09-08 09:34:56 +02:00
Lukacs T. Berki
9ac1235e62 Pass StopBefore as an argument to RunBlueprint. am: a9768e1ad7 am: d77170912f
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1820190

Change-Id: I086d74435315db8fb0116946e029da25b80067d3
2021-09-08 06:53:56 +00:00
Lukacs T. Berki
d77170912f Pass StopBefore as an argument to RunBlueprint. am: a9768e1ad7
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1820190

Change-Id: I5d6b62368bd4350aad66de45c92259138d86b0ad
2021-09-08 06:37:14 +00:00
Lukacs T. Berki
a9768e1ad7 Pass StopBefore as an argument to RunBlueprint.
Its value is a function of the call site, so it doesn't make a lot of
sense to plumb it through the configuration.

Test: Presubmits.
Change-Id: I5081650818664f283ebc5dc04daef90c26759353
2021-09-07 18:12:29 +02:00
Lukacs T. Berki
ed45d5fcef Remove ConfigRemoveAbandonedFilesUnder. am: f99e89c147 am: 6a48d308a6
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1817977

Change-Id: I34ca615d09f3f458db496dc6ce04cda61df36f4e
2021-09-06 12:29:10 +00:00
Lukacs T. Berki
6a48d308a6 Remove ConfigRemoveAbandonedFilesUnder. am: f99e89c147
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1817977

Change-Id: I78ad77bcf99c77e372c3e2cf6c3b207df9965daa
2021-09-06 12:13:16 +00:00
Lukacs T. Berki
f99e89c147 Remove ConfigRemoveAbandonedFilesUnder.
It was not implemented by anyone.

Test: Presubmits.
Change-Id: I8b98620c0ef9c1f242fe7fc0a7d810f2af15d042
2021-09-06 11:35:28 +02:00
Lukács T. Berki
fddc41e854 Merge "Rename Blueprints to Android.bp ." am: 5e56efb7c8 am: 3b69a0a224
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1817978

Change-Id: Iaa71a65a4df1bf1fa59745491851f9511cdc1a2e
2021-09-03 18:50:27 +00:00
Lukács T. Berki
3b69a0a224 Merge "Rename Blueprints to Android.bp ." am: 5e56efb7c8
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1817978

Change-Id: I70d85f0dccdd6390ca198132455d5ea3b33292c1
2021-09-03 18:38:53 +00:00
Lukács T. Berki
5e56efb7c8 Merge "Rename Blueprints to Android.bp ." 2021-09-03 18:20:39 +00:00
Lukacs T. Berki
83325479ee Make cmdline args consistent with what they do. am: 9b435b8089 am: 8a97f47ac3
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1815793

Change-Id: If12a59545fce350b1b760708b029d7e85b9a2ba2
2021-09-02 15:57:20 +00:00
Lukacs T. Berki
8a97f47ac3 Make cmdline args consistent with what they do. am: 9b435b8089
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1815793

Change-Id: I65e4a1ca16684ab1efe7600d55b67fdbb69550d9
2021-09-02 15:48:56 +00:00
Lukacs T. Berki
9b435b8089 Make cmdline args consistent with what they do.
Test: Presubmits.
Change-Id: I6d5f827e06526a121f915aae57c6f086ba44f21d
2021-09-02 13:29:10 +02:00
Lukacs T. Berki
cd0ca27287 Remove the bootstrap.Config class. am: d782b504e0 am: cf5b271af2
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1817976

Change-Id: I3b2d242c7904c52ee7aaa4df458b6742638692c8
2021-09-02 11:07:55 +00:00
Lukacs T. Berki
cf5b271af2 Remove the bootstrap.Config class. am: d782b504e0
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1817976

Change-Id: Ifbd54ab958809635d39b49f52ed63765c7c7d3d1
2021-09-02 10:53:13 +00:00
Lukacs T. Berki
eef5685c65 Rename Blueprints to Android.bp .
This was the only one in the source tree.

Side cleanup: remove some dead code that I assume comes from the time
where Blueprint files had to specify what subdirectories other Blueprint
files are in.

Test: Presubmits.
Change-Id: If84c4e85bc5516f30da97c1be29b56e50dddb3c4
2021-09-02 11:48:19 +02:00
Lukacs T. Berki
d782b504e0 Remove the bootstrap.Config class.
It was confusing because there are two concepts with the same name:
thebootstrapping config special-cased in the bootstrap modules /
singletons and the "global" config.

This change folds the first into the second.

A further next step would be to split the Go parts and the Ninja parts
(subninjas + primary builder invocation) apart, but at some point, I
should stop gold-plating this.

Test: Presubmits.
Change-Id: Id341dee664a9d2527535f4f9980e5f0d10139eef
2021-09-02 09:58:45 +02:00
Lukacs T. Berki
fde1b191ce Simplify bootstrapping: am: ceb3c43f65 am: 8c57b1e2e9
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1814783

Change-Id: I12ff9ef0618f9e3a1d25b76a399c0d74bf44a40f
2021-09-01 14:43:38 +00:00
Lukacs T. Berki
8c57b1e2e9 Simplify bootstrapping: am: ceb3c43f65
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1814783

Change-Id: I9ef24bad2a7dd94fc6780768f590d94c32198d85
2021-09-01 14:28:44 +00:00
Lukacs T. Berki
ceb3c43f65 Simplify bootstrapping:
- Remove the bootstrap_go_binary module type in favor of
blueprint_go_binary
- Make it so that all the binaries used during bootstrapping are in the
host tool directory so that the bootstrap and main Ninja files are
consistent

Test: Presubmits.

Change-Id: I00744fec0474fbea89db6c0c0338856453138564
2021-09-01 11:55:00 +02:00
Lukacs T. Berki
40c2cd13a5 Remove some unnecessary arguments from Blueprint. am: ce41c169b5 am: f05ce1b487
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1814158

Change-Id: I66bd26336b69ddb841eafec17b76d8d3239807ab
2021-08-31 14:07:29 +00:00
Lukacs T. Berki
f05ce1b487 Remove some unnecessary arguments from Blueprint. am: ce41c169b5
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1814158

Change-Id: Id3bfbe21e3c1cc94597b513a7f159b52a13e5820
2021-08-31 13:48:47 +00:00
Lukacs T. Berki
ce41c169b5 Remove some unnecessary arguments from Blueprint.
What's gone:

- TopFile (it's always Android.bp)
- GeneratingPrimaryBuilder (we don't make that distinction anymore)

Also rename BuildDir and NinjaBuildDir to SoongOutDir and OutDir,
respectively, to be consistent with the rest of the code.

Test: Presubmits.
Change-Id: I55ecb02a59fe68bf5674395a108181ea7557b21f
2021-08-31 10:58:04 +02:00
Lukacs T. Berki
8831b322c2 Remove Depfiles from bootstrap.Args . am: 0459f6b18e am: 10c8322ae6
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1808877

Change-Id: Ia36367d30dfafd66e3055b6e6da9cc1e914f50b6
2021-08-27 20:10:46 +00:00
Lukacs T. Berki
10c8322ae6 Remove Depfiles from bootstrap.Args . am: 0459f6b18e
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1808877

Change-Id: Ic45a0fd380cb8288a58a7339885ca59d0248c73c
2021-08-27 19:56:54 +00:00
Lukacs T. Berki
33eb573e2b [automerger skipped] Rename BuildDir and NinjaBuildDir. am: 5c4abb15e3 am: eb25e8caee -s ours
am skip reason: Merged-In I334ab40c668d2a94536f3e63d5f1fa0b401388ac with SHA-1 81c5b5917d is already in history

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

Change-Id: I2b65f95480186598b3f13226c2730d8c4a98cc5c
2021-08-27 14:04:42 +00:00
Lukacs T. Berki
0459f6b18e Remove Depfiles from bootstrap.Args .
It is not used anymore; Soong assumes that the depfile is just the name
of the output file with a ".d" suffix.

Test: Presubmits.
Change-Id: Ifbf722dcdffc8420e12a032e23ab791a6be5a736
2021-08-27 15:56:00 +02:00
Lukacs T. Berki
eb25e8caee Rename BuildDir and NinjaBuildDir. am: 5c4abb15e3
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1810317

Change-Id: Ie22c1062431149e97f3bc37395b5c7434e92a476
2021-08-27 13:54:13 +00:00
Lukacs T. Berki
5c4abb15e3 Rename BuildDir and NinjaBuildDir.
These are just out/ and out/soong/ and the old names were quite
confusing.

Test: Presubmits.
Merged-In: Idd9ce3c38a259faabcc56f0cd3fdac8b289123b1
Merged-In: I334ab40c668d2a94536f3e63d5f1fa0b401388ac
Change-Id: Ib7c568c6a97701f2240c5e3f0f2ce67397819ac0
2021-08-26 15:08:09 +02:00
Lukacs T. Berki
81c5b5917d Rename BuildDir and NinjaBuildDir.
These are just out/ and out/soong/ and the old names were quite
confusing.

Test: Presubmits.
Merged-In: Idd9ce3c38a259faabcc56f0cd3fdac8b289123b1
Change-Id: I334ab40c668d2a94536f3e63d5f1fa0b401388ac
2021-08-26 11:20:56 +02:00
Lukacs T. Berki
d4b568731f Do not separate .primary and .bootstrap dirs. am: 51b625928d am: 3377feea84
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1802496

Change-Id: Ib8e5556c6940a3968fe8a37d307bcaed0c815bc7
2021-08-19 18:36:07 +00:00
Lukacs T. Berki
3377feea84 Do not separate .primary and .bootstrap dirs. am: 51b625928d
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1802496

Change-Id: I2040b9b2de6bf90c09d8d1723c9165113c75ed6d
2021-08-19 18:17:09 +00:00
Lukacs T. Berki
31e27614c0 Do not reference Ninja variables in Makefiles. am: 5f0a740fed am: 2ece082345
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1800994

Change-Id: Ieae1669149462e89cb3bfa6255b1f5f4ca442064
2021-08-19 15:29:34 +00:00
Lukacs T. Berki
2ece082345 Do not reference Ninja variables in Makefiles. am: 5f0a740fed
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1800994

Change-Id: I833d40edc47b402ec01770a6cb3e0ac9a2f9f909
2021-08-19 15:16:22 +00:00
Lukacs T. Berki
51b625928d Do not separate .primary and .bootstrap dirs.
This makes it possible to share work between the bootstrap and the main
Ninja file.

As a side fix, remove the reference to $srcDir from moduleSrcDir() since
that is hardwired to "." anyway.

Test: Presubmits.
Change-Id: Ia4a251dd34273ec3e0436ac7a2fbafe4ef46c73f
2021-08-19 16:26:36 +02:00
Lukacs T. Berki
5f0a740fed Do not reference Ninja variables in Makefiles.
installPath was included by androidmk.go in the Soong-generated
Android.mk file, which means that the Ninja variable reference
`$buildDir` passe through Kati, with unpredictable results.

`$buildDir` is still used in a few places, but those are not problematic
because they are not copied to Android.mk (they could probably be
removed, but it's not trivial enough to be done as a drive-by fix)

Test: Presubmits.
Change-Id: I6a5ea8b1679001ff685d263310cb061d3a6a992e
2021-08-19 13:46:22 +02:00
Lukács T. Berki
a80ead1974 Merge "Do not do glob-related things in RunBlueprint()." am: 3bec89465e am: 58c28580fd
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1799767

Change-Id: I6cee2482f510ecfce8e9aa4c21e00e06269d883d
2021-08-19 06:43:45 +00:00
Lukács T. Berki
58c28580fd Merge "Do not do glob-related things in RunBlueprint()." am: 3bec89465e
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1799767

Change-Id: I6e7b980bcdfea32ba32a6f626e16f854ac5b8267
2021-08-19 06:31:35 +00:00
Lukács T. Berki
3bec89465e Merge "Do not do glob-related things in RunBlueprint()." 2021-08-19 06:17:32 +00:00
Lukacs T. Berki
008b6ea661 Do not do glob-related things in RunBlueprint().
From now on, the responsibility of writing build-globs.ninja and adding
the glob list files to build.ninja.d will be the responsibility of
whoever calls Blueprint.

It's nicer this way because the bootstrap Blueprint invocation does not
need globs and Blueprint can be invoked multiple times from the
soong_build binary depending on what it does.

Regrettably, the little Blueprint invocation that generates
build-globs.ninja still requires a reference to a BootstrapConfig
because GlobRule references ${buildDir}.

Side cleanup: remove Args.DocFile, which was unused.

Test: Presubmits.
Change-Id: I37586966e3d6b7557a490ed1ae81ec596ec66ee5
2021-08-19 08:16:19 +02:00
Liz Kammer
1dcc33f114 Use pretty print for json module graph am: 6e4ee8db2d am: 32d736310a
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1799130

Change-Id: Ie277eceafb5aeaec20e90287f044ac1f00b46194
2021-08-18 07:51:14 +00:00
Liz Kammer
32d736310a Use pretty print for json module graph am: 6e4ee8db2d
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1799130

Change-Id: I0d90d7f584ba32ab1af899b340ea265fd64deb64
2021-08-18 07:35:23 +00:00
Liz Kammer
6e4ee8db2d Use pretty print for json module graph
Test: SOONG_DUMP_JSON_MODULE_GRAPH=/tmp/json/srcs m nothing and verify
      output
Change-Id: I779dcebce7435f2f48263909c4c62c27c0fbfec4
2021-08-17 17:32:42 -04:00
Lukacs T. Berki
9c5c2d53e4 Remove Srcdir() from BootstrapConfig. am: 6ec924c12b am: ee289293ea
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1796651

Change-Id: I971741209908aaef5695756d8804eab63c5bbba9
2021-08-17 15:27:33 +00:00
Lukacs T. Berki
7b565f548c Remove global variables in command.go . am: 980c1f0c72 am: b636b78072
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1796446

Change-Id: Ia99ddafe6dd6e46ed6865eb0f1d11177d18ef715
2021-08-17 15:27:32 +00:00