tequilaOS/platform_build_blueprint
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2372 commits 1 branch 0 tags 7.4 MiB
Commit graph

2372 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
66b1f09643 Simplify bootstrapping: am: ceb3c43f65 am: 8c57b1e2e9 am: fde1b191ce am: 839c14590a am: 773cc78a6e 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1814783

Change-Id: I12933ae18095c2a25e7e15e92c3287c8019ac21e
 2021-09-01 15:28:01 +00:00
Lukacs T. Berki
773cc78a6e Simplify bootstrapping: am: ceb3c43f65 am: 8c57b1e2e9 am: fde1b191ce am: 839c14590a 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1814783

Change-Id: Ie7e7e546c3e5fbd0e41695af69073542d1c4f5b9
 2021-09-01 15:12:32 +00: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
fbe26d335e Remove some unnecessary arguments from Blueprint. am: ce41c169b5 am: f05ce1b487 am: 40c2cd13a5 am: 9da7aa7843 am: 28dc7366e1 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1814158

Change-Id: I4d491d73e7edc5e6995c4170312183f27020ef7d
 2021-08-31 14:58:43 +00:00
Lukacs T. Berki
28dc7366e1 Remove some unnecessary arguments from Blueprint. am: ce41c169b5 am: f05ce1b487 am: 40c2cd13a5 am: 9da7aa7843 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1814158

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

Change-Id: Ide4ed601bf219052f06f0b2abba70263c56d6147
 2021-08-27 20:51:49 +00:00
Lukacs T. Berki
72c7ff3072 Remove Depfiles from bootstrap.Args . am: 0459f6b18e am: 10c8322ae6 am: 8831b322c2 am: 4b2a5ab18d 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1808877

Change-Id: Id99f62ef5615d622b2472beac59d0aa19cc29222
 2021-08-27 20:38:06 +00: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
65c64beae7 [automerger skipped] Rename BuildDir and NinjaBuildDir. am: 5c4abb15e3 am: eb25e8caee -s ours am: 33eb573e2b -s ours am: c041c85168 -s ours am: b54acd0681 -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: Iabe0cc63e67a2fe6566415e81265ded75bc98bfa
 2021-08-27 14:51:07 +00:00
Lukacs T. Berki
b54acd0681 [automerger skipped] Rename BuildDir and NinjaBuildDir. am: 5c4abb15e3 am: eb25e8caee -s ours am: 33eb573e2b -s ours am: c041c85168 -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: I63ed5d19ad788f2152d43ad94f036e21637838a3
 2021-08-27 14:38:00 +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
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
3325b8aaef [automerger skipped] Rename BuildDir and NinjaBuildDir. am: 81c5b5917d am: 29072a7b70 am: 76c9a867e7 -s ours 
am skip reason: Merged-In Idd9ce3c38a259faabcc56f0cd3fdac8b289123b1 with SHA-1 843db40eea is already in history

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

Change-Id: I4f3084b5d0f4721a6833635c7264dbe47dc1e34e
 2021-08-27 08:16:46 +00:00
Lukacs T. Berki
76c9a867e7 Rename BuildDir and NinjaBuildDir. am: 81c5b5917d am: 29072a7b70 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/blueprint/+/15682583

Change-Id: Ice2f888b494654fef5907b55b5635384b6c0d97e
 2021-08-27 08:01:22 +00:00
Lukacs T. Berki
29072a7b70 Rename BuildDir and NinjaBuildDir. am: 81c5b5917d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/blueprint/+/15682583

Change-Id: I8da1e2ea17f52cac9c984bba27dd8dc5a348597d
 2021-08-27 07:11:18 +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
843db40eea Rename BuildDir and NinjaBuildDir. 
These are just out/ and out/soong/ and the old names were quite
confusing.

Test: Presubmits.
Change-Id: Idd9ce3c38a259faabcc56f0cd3fdac8b289123b1
 2021-08-23 13:49:20 +02:00
Lukacs T. Berki
b773e4fb03 Do not separate .primary and .bootstrap dirs. am: 51b625928d am: 3377feea84 am: d4b568731f am: 46e71162fb am: 3e92e33446 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1802496

Change-Id: I566e416facb577ebae31633d7161978047ca5c84
 2021-08-19 19:24:15 +00:00
Lukacs T. Berki
3e92e33446 Do not separate .primary and .bootstrap dirs. am: 51b625928d am: 3377feea84 am: d4b568731f am: 46e71162fb 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1802496

Change-Id: I327ba29affd5dac120f4aeaf3fface33560482b3
 2021-08-19 19:09:23 +00:00
Lukacs T. Berki
46e71162fb Do not separate .primary and .bootstrap dirs. am: 51b625928d am: 3377feea84 am: d4b568731f 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1802496

Change-Id: I8c1213c5ed43c8488f9f99e212babc2286dbbc33
 2021-08-19 18:50:05 +00: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
653aef0cd1 Do not reference Ninja variables in Makefiles. am: 5f0a740fed am: 2ece082345 am: 31e27614c0 am: 350e525789 am: a557d83b75 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1800994

Change-Id: I8267931f165c4b6e257e309cf88557158099667e
 2021-08-19 16:01:15 +00:00
Lukacs T. Berki
a557d83b75 Do not reference Ninja variables in Makefiles. am: 5f0a740fed am: 2ece082345 am: 31e27614c0 am: 350e525789 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1800994

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

Change-Id: I65f08c907fefc77389265dae4bb29219db16a9ec
 2021-08-19 15:42:31 +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
aebe11a384 Merge "Do not do glob-related things in RunBlueprint()." am: 3bec89465e am: 58c28580fd am: a80ead1974 am: 59ef06ad04 am: 8e6d82354e 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1799767

Change-Id: I19ba78666fc980dad90a21ce968748460888aeca
 2021-08-19 08:35:20 +00:00
Lukács T. Berki
8e6d82354e Merge "Do not do glob-related things in RunBlueprint()." am: 3bec89465e am: 58c28580fd am: a80ead1974 am: 59ef06ad04 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1799767

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

Change-Id: Ia4d2fc857823e12095d45de8274bb99bf2c51c5e
 2021-08-19 06:59:50 +00: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