Commit graph

1979 commits

Author SHA1 Message Date
Treehugger Robot
2e6b19831c Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/blueprint" am: b3ba44c8d3 am: 23621090db
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1822217

Change-Id: If89d56238b91175ebb0ed9760675dfce3712b47a
2021-09-09 22:29:22 +00:00
Treehugger Robot
23621090db Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/blueprint" am: b3ba44c8d3
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1822217

Change-Id: Idc743777aff29b42995f11075916c9552a2668da
2021-09-09 22:11:42 +00:00
Treehugger Robot
b3ba44c8d3 Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/blueprint" 2021-09-09 21:49:26 +00:00
Martin Stjernholm
af564e41a9 Document that blueprint:"mutated" properties are skipped.
Test: n/a - comment change only
Change-Id: I717c549093bf4b744af75a43219cb353510bfcad
2021-09-09 20:49:58 +01:00
Lukacs T. Berki
6217d0fe53 Remove UseValidationsForGoTests. am: d9d298c760 am: f16d2de6d0 am: 06844fc461
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1821772

Change-Id: I68980c20b03885a171e52d033678d9fcac1ee475
2021-09-09 06:59:16 +00:00
Lukacs T. Berki
06844fc461 Remove UseValidationsForGoTests. am: d9d298c760 am: f16d2de6d0
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1821772

Change-Id: I88d9f5ddb58af4b50ffb5c4ed6d7a2296c3c268d
2021-09-09 06:43:58 +00:00
Lukacs T. Berki
f16d2de6d0 Remove UseValidationsForGoTests. am: d9d298c760
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1821772

Change-Id: I8a4958fea48cb695ea632e880f01776dbbc902d2
2021-09-09 06:24:32 +00:00
Bob Badour
76f9b09e3d [LSC] Add LOCAL_LICENSE_KINDS to build/blueprint
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to:
  Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: Iba783a5b977976ee2d49a8553908fec1219dad68
2021-09-08 14:01:45 -07:00
Lukacs T. Berki
1040846cd3 Remove PrimaryBuilderExtraFlags and cull Args. am: 5d5ed5fc6b am: 32d5d542d2 am: 1ff903cbac
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1819862

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

Change-Id: I31f98f6be1021980624b592f8026afa55c9b375c
2021-09-08 14:08:32 +00:00
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
d9d298c760 Remove UseValidationsForGoTests.
Whenever it was called, it returned true.

Test: Presubmits.
Change-Id: Iabe5a99b8363771d06b200d4641d9ce477ba5b6e
2021-09-08 15:32:52 +02: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
a988f811d5 Pass StopBefore as an argument to RunBlueprint. am: a9768e1ad7 am: d77170912f am: 9ac1235e62
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1820190

Change-Id: Ia73be93912d12ff8246ee15e873285700999abeb
2021-09-08 07:07:28 +00: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
6416617f07 Remove ConfigRemoveAbandonedFilesUnder. am: f99e89c147 am: 6a48d308a6 am: ed45d5fcef
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1817977

Change-Id: I8dea7d64386de510d58fb6235012678db1a356b8
2021-09-06 12:39:17 +00: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
00b3d4f364 Merge "Rename Blueprints to Android.bp ." am: 5e56efb7c8 am: 3b69a0a224 am: fddc41e854
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1817978

Change-Id: I52f4849383bd4d3c2c462143cc3a68db5bf30912
2021-09-03 19:07:48 +00: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
aa3d726821 Make cmdline args consistent with what they do. am: 9b435b8089 am: 8a97f47ac3 am: 83325479ee
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1815793

Change-Id: Ie11b6d0df11038ec7d0b1cfb2b1af1f1e2632045
2021-09-02 16:13:55 +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
385732a99e Remove the bootstrap.Config class. am: d782b504e0 am: cf5b271af2 am: cd0ca27287
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1817976

Change-Id: I7e84b3fef692ecdf356da4573d563cbf7f95f54f
2021-09-02 11:23:23 +00: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
839c14590a Simplify bootstrapping: am: ceb3c43f65 am: 8c57b1e2e9 am: fde1b191ce
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1814783

Change-Id: If08cafa6d49c9688b02caf28573bf51591880cf6
2021-09-01 14:58:27 +00: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
9da7aa7843 Remove some unnecessary arguments from Blueprint. am: ce41c169b5 am: f05ce1b487 am: 40c2cd13a5
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1814158

Change-Id: Ie228a86d7092d20a7beb7984c6bbdb0ec54ff735
2021-08-31 14:23:21 +00: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
4b2a5ab18d Remove Depfiles from bootstrap.Args . am: 0459f6b18e am: 10c8322ae6 am: 8831b322c2
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1808877

Change-Id: I6d03b89b4c51d6414c64587bc9bd0553ed3b4eb6
2021-08-27 20:23:11 +00: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
c041c85168 [automerger skipped] Rename BuildDir and NinjaBuildDir. am: 5c4abb15e3 am: eb25e8caee -s ours am: 33eb573e2b -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: I18836fac7464ba392ccbd8d110d546b12e6925e3
2021-08-27 14:26:22 +00:00