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

1979 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
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
0ca3e11123 Use pretty print for json module graph am: 6e4ee8db2d am: 32d736310a am: 1dcc33f114 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1799130

Change-Id: I4f0dc1b7f362a8188d8ac70298a892461c1d1715
 2021-08-18 08:06:09 +00: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
f693779807 Remove Srcdir() from BootstrapConfig. am: 6ec924c12b am: ee289293ea am: 9c5c2d53e4 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1796651

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

Change-Id: Ib5608785db5a0a6604cc26107920e2b05c987129
 2021-08-17 15:41:50 +00:00
Lukacs T. Berki
27729ad8d2 Delete support for standalone Blueprint. am: 016a7dd6ef am: d812a01b1b am: 7b25411e98 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1796439

Change-Id: Ia0c7b1fa5a5574d73346f3e34fff9ec85a3cf8eb
 2021-08-17 15:41:50 +00:00
Lukacs T. Berki
1daac99edc Remove the ability to emit Blueprint docs. am: 64ee4262a0 am: 7f5966aea0 am: ba29268a8e 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1796437

Change-Id: I647f76782e73c1608791bec9e3c0287452f35581
 2021-08-17 15:41:49 +00: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
Lukacs T. Berki
7b25411e98 Delete support for standalone Blueprint. am: 016a7dd6ef am: d812a01b1b 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1796439

Change-Id: I7c912450dbe9e2b4479ee47c3ba02c081fae5c4a
 2021-08-17 15:27:32 +00:00
Lukacs T. Berki
ba29268a8e Remove the ability to emit Blueprint docs. am: 64ee4262a0 am: 7f5966aea0 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1796437

Change-Id: If8397bb195961bf42319e1d5378af61e99d9e06d
 2021-08-17 15:27:30 +00:00
Lukacs T. Berki
ee289293ea Remove Srcdir() from BootstrapConfig. am: 6ec924c12b 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1796651

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

Change-Id: I6bfe4b9864b406e58aa6af2007f486dc6a442b81
 2021-08-17 15:14:20 +00:00
Lukacs T. Berki
d812a01b1b Delete support for standalone Blueprint. am: 016a7dd6ef 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1796439

Change-Id: I0383b473121ed81fba0c6fe98ccc8109cced7258
 2021-08-17 15:14:20 +00:00
Lukacs T. Berki
7f5966aea0 Remove the ability to emit Blueprint docs. am: 64ee4262a0 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1796437

Change-Id: I22125bda108939bbe6a603abf483a5dbf5d1a851
 2021-08-17 15:14:19 +00:00
Lukacs T. Berki
6ec924c12b Remove Srcdir() from BootstrapConfig. 
It was always ".".

Test: Presubmits.
Change-Id: I0612b9b07233659adc708b9710db9aec6e24f224
 2021-08-16 17:04:50 +02:00
Lukacs T. Berki
980c1f0c72 Remove global variables in command.go . 
There used to be two:
- The absolute source directory is now threaded through the code instead
- The command line arguments are moved to soong_build

Test: Presubmits.

Change-Id: Ie09de1a2862ec4ced2c7385198300359f805127d
 2021-08-16 15:28:04 +02:00
Lukacs T. Berki
016a7dd6ef Delete support for standalone Blueprint. 
Now that Blueprint has been merged with Soong, a large amount of code is
unnecessary.

Test: Presubmits.
Change-Id: I8d30d8b80f37fdc6a9db630a1792c57c7d6edb38
 2021-08-16 14:09:47 +02:00
Lukacs T. Berki
64ee4262a0 Remove the ability to emit Blueprint docs. 
This is not necessary anymore now that Blueprint doesn't have a separate
existence and Soong's documentation generation uses a completely
separate code path.

Test: Presubmits.
Change-Id: Ibc9e57379c5f8ee9a06d90fbe81fac314f01ee92
 2021-08-16 13:42:42 +02:00
Lukacs T. Berki
f6ff0287bd Explain why build.ninja is a non-default output. am: 0eb24a7041 am: b7e1688954 am: 5846dbb290 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1796431

Change-Id: I1048984b9ac275670d6f9acbd8544ad3c457174a
 2021-08-16 10:32:26 +00:00
Lukacs T. Berki
2d36c81913 Separate the concept of subninjas and glob files. am: d3a0637702 am: ba3389c635 am: 01893ca863 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1794507

Change-Id: Id83c6c33047185d47fdce7d95a8dda545dc89f4f
 2021-08-16 10:32:20 +00:00
Lukacs T. Berki
5846dbb290 Explain why build.ninja is a non-default output. am: 0eb24a7041 am: b7e1688954 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1796431

Change-Id: I7d980690a82e265e2a9507b89d48acc093adecb3
 2021-08-16 10:16:39 +00:00
Lukacs T. Berki
01893ca863 Separate the concept of subninjas and glob files. am: d3a0637702 am: ba3389c635 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1794507

Change-Id: I49747e82f2a49c58fef34997b559afddb0b1bb5c
 2021-08-16 10:16:31 +00:00
Lukacs T. Berki
b7e1688954 Explain why build.ninja is a non-default output. am: 0eb24a7041 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1796431

Change-Id: Ia57fa998d681a588d72a72a6281685b67991696a
 2021-08-16 10:02:49 +00:00
Lukacs T. Berki
ba3389c635 Separate the concept of subninjas and glob files. am: d3a0637702 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1794507

Change-Id: I4514143e03335dc348c25c6b61f0913224b6b8af
 2021-08-16 10:02:43 +00:00
Lukacs T. Berki
0eb24a7041 Explain why build.ninja is a non-default output. 
Test: Only comment change.
Change-Id: I335670b7f3bed0fe34fdb1d625b6e459146cc192
 2021-08-16 11:48:51 +02:00
Lukacs T. Berki
d3a0637702 Separate the concept of subninjas and glob files. 
This makes the distinction between what the bootstrap .ninja file and
the main .ninja files do clearer: the bootstrap .ninja file includes the
build-globs.ninja file(s) which the main .ninja file writes.

This required removing the "default" statement from said bootstrap
.ninja file: now we can build more than one thing instead of just
build.ninja and thus soong_ui explicitly tells Ninja what to do instead.

On the side, stop catering for the use case where the bootstrap
Blueprint invocation uses globs: Soong's does not and that's our only
use case.

Test: Presubmits.

Change-Id: Icffce31928242cfe9cdab56b290a37598d32a58c
 2021-08-16 09:16:09 +02:00
Xin Li
990fb5e787 [automerger skipped] Mark sc-dev-plus-aosp-without-vendor@7634622 as merged am: bb964bc8eb -s ours am: a71df7be16 -s ours 
am skip reason: Merged-In Ibc01f9d5af34f9caeac114b98f7dfb2b5770f222 with SHA-1 74137dfbbb is already in history

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

Change-Id: I7f47059430e40712ad66787c39c05e3b21789268
 2021-08-14 06:42:16 +00:00
Xin Li
a71df7be16 [automerger skipped] Mark sc-dev-plus-aosp-without-vendor@7634622 as merged am: bb964bc8eb -s ours 
am skip reason: Merged-In Ibc01f9d5af34f9caeac114b98f7dfb2b5770f222 with SHA-1 74137dfbbb is already in history

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

Change-Id: Id0828b8a4157a52365e327fad35d20e23e22a4d4
 2021-08-14 06:29:53 +00:00
Xin Li
bb964bc8eb Mark sc-dev-plus-aosp-without-vendor@7634622 as merged 
Merged-In: Ibc01f9d5af34f9caeac114b98f7dfb2b5770f222
Change-Id: Ic01b923c7858bde6cf8d153950fc1771dc52aede
 2021-08-14 06:03:52 +00:00