Commit graph

2151 commits

Author SHA1 Message Date
Trevor Radcliffe
0bf636f3ef Merge "Change bpdoc to separate entries with the same type" 2021-11-05 16:11:23 +00:00
Lukacs T. Berki
ea596bace7 Remove the -v argument from bpglob. am: f12f1d7d1e am: ebe9022a3a am: f941e9c671 am: 6fbf6f347e
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1879699

Change-Id: Ic337aa0a5cdf3c174929059f18bcc61ceee301e4
2021-11-04 18:34:50 +00:00
Lukacs T. Berki
6fbf6f347e Remove the -v argument from bpglob. am: f12f1d7d1e am: ebe9022a3a am: f941e9c671
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1879699

Change-Id: I36349e0616f8e378359d2d49083b9affa1a64f51
2021-11-04 18:17:39 +00:00
Lukacs T. Berki
f941e9c671 Remove the -v argument from bpglob. am: f12f1d7d1e am: ebe9022a3a
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1879699

Change-Id: I919b06f552f8e751817d4b46012a0019bb31687b
2021-11-04 17:48:15 +00:00
Lukacs T. Berki
ebe9022a3a Remove the -v argument from bpglob. am: f12f1d7d1e
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1879699

Change-Id: I20ec093492a1a507e7c13ca57d5f1e5478acd122
2021-11-04 17:28:28 +00:00
Lukacs T. Berki
f12f1d7d1e Remove the -v argument from bpglob.
Now that we have bootstrapEpoch, it's not necessary anymore.

Test: Presubmits.
Change-Id: If36cf3c8f71c1023003f408b4e799bbbdba6fa27
2021-11-04 11:48:43 +01:00
Colin Cross
225f06e3fe Move bpglob out of ToolDir am: 37d151ff95 am: 64310fcea0 am: 669e58631f am: 5832ba46d5
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1875757

Change-Id: Ibb0b8ab3b04439a385420548c55dd090aac1d351
2021-11-02 21:56:16 +00:00
Colin Cross
5832ba46d5 Move bpglob out of ToolDir am: 37d151ff95 am: 64310fcea0 am: 669e58631f
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1875757

Change-Id: Ifcb5664949a90efbf36a4a28415803ca727a56b1
2021-11-02 21:46:08 +00:00
Colin Cross
669e58631f Move bpglob out of ToolDir am: 37d151ff95 am: 64310fcea0
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1875757

Change-Id: I401989d46b08197c6e0ec27b11069411efc97d98
2021-11-02 21:23:11 +00:00
Colin Cross
64310fcea0 Move bpglob out of ToolDir am: 37d151ff95
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1875757

Change-Id: Ie1f43f637177a9d0667f6d59ce9ab0e820d809bb
2021-11-02 21:06:54 +00:00
Trevor Radcliffe
d14f342fa6 Change bpdoc to separate entries with the same type
Presently, entries in the Soong reference docs that
share the same type are condensed into a single entry.
This is very unintuitive, so this change removes that
functionality.

Fixes: 204441523
Test: bpdoc_test.go
Test: build and compare Soong docs
Change-Id: Ic03891a8a7a29b5f7ee58c01b2fa05a0c27e0a2b
2021-11-02 15:59:48 +00:00
Colin Cross
37d151ff95 Move bpglob out of ToolDir
ToolDir is going to become unstable when switching between KatiEnabled
and Soong-only builds while the duplication between out/soong/host and
out/host is resolved.  bpglob gets executed very early during bootstrap,
before the primary builder has run to update the paths to match the
current configuration.  Move it into SoongOutDir() so that its path
is more stable.

The copy of bpglob in ToolDir is still used when bpglob is used by the
primary builder through bootstrap.GlobFile.

Bug: 204136549
Test: m nothing
Change-Id: Ida51997b6408d7c265f3ba343278e5e2968467d3
2021-11-01 22:54:02 -07:00
Colin Cross
137655633f Handle dangling symlinks when following symlinks am: 0e306e7a89 am: 30faeb6ad6 am: 45480fc84f am: 3153a00579
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1851040

Change-Id: Ic37bdbbf903d6e627ce74fd25c25025d86da1ae1
2021-10-11 18:47:50 +00:00
Colin Cross
3153a00579 Handle dangling symlinks when following symlinks am: 0e306e7a89 am: 30faeb6ad6 am: 45480fc84f
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1851040

Change-Id: Iedf44f8e0a7943f6b8d7c4e56e33edca065b1332
2021-10-11 18:32:08 +00:00
Colin Cross
45480fc84f Handle dangling symlinks when following symlinks am: 0e306e7a89 am: 30faeb6ad6
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1851040

Change-Id: I3ae5be2c0402a32760c62d4d22184b4635405ec1
2021-10-11 18:15:31 +00:00
Colin Cross
30faeb6ad6 Handle dangling symlinks when following symlinks am: 0e306e7a89
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1851040

Change-Id: I7bf8c61931edc11888f1fc015dac7f596096ce32
2021-10-11 17:58:49 +00:00
Colin Cross
0e306e7a89 Handle dangling symlinks when following symlinks
When globbing with following symlinks enabled, treat dangling symlinks
as files instead of erroring.

Bug: 202547639
Test: TestGlobFollowDanglingSymlinks
Change-Id: Ic1b241d3fcf1bc6989cb724d00c2b97fefa8dcdb
2021-10-08 17:50:17 -07:00
Spandan Das
12a4ffc88f Merge "bpdocs for struct types created using reflection" am: 87fd4b11af am: 8c25febaf9 am: 678e2ea12b am: 10ef8ee70c
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1820757

Change-Id: I36707bfedd9e30dedc52bf1855c3e0cf495615a1
2021-09-21 21:01:18 +00:00
Spandan Das
10ef8ee70c Merge "bpdocs for struct types created using reflection" am: 87fd4b11af am: 8c25febaf9 am: 678e2ea12b
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1820757

Change-Id: Ide155fbc4b2a982177f4082d6a27d05ddc9bd675
2021-09-21 20:46:57 +00:00
Spandan Das
678e2ea12b Merge "bpdocs for struct types created using reflection" am: 87fd4b11af am: 8c25febaf9
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1820757

Change-Id: I13b14dd9c9a56ac8a946b4c0a04f64d510098764
2021-09-21 20:34:25 +00:00
Spandan Das
8c25febaf9 Merge "bpdocs for struct types created using reflection" am: 87fd4b11af
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1820757

Change-Id: I6c3b9563df74a1c55b3a784bceae915b9f9c7b98
2021-09-21 20:21:53 +00:00
Spandan Das
87fd4b11af Merge "bpdocs for struct types created using reflection" 2021-09-21 20:00:35 +00:00
Spandan Das
1109cd96b7 bpdocs for struct types created using reflection
struct types defined using reflection have empty PkgPaths(), due to
which they were not added to the generated bpdocs. This CL allows
us to generate bpdocs for such struct types.

For each field in the struct, the algorithm checks the following and
creates a PropertyStruct object accordingly
1. If field is a primitive type (Base condition)
2. If field is another exported struct (Base condition)
3. If field is another struct created using reflection (Recurse)

Test: m soong_docs
Test: java_sdk_library_import before
https://ci.android.com/builds/submitted/7710820/linux/latest/view/java.html#java_sdk_library_import
and after
https://spandandas.users.x20web.corp.google.com/docs/java.html#java_sdk_library_import
Bug: 172797653

Change-Id: I0349e405fd290d427fa0b38a109b4212aace50c6
2021-09-20 22:33:05 +00:00
Martin Stjernholm
5c41e52f65 Merge "Document that blueprint:"mutated" properties are skipped." am: 9fd2ed93df am: 7cf283232e am: bd3c584db6 am: 455adcb019
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1823195

Change-Id: If1674efd70882577f1acf79c748279abae5eed45
2021-09-10 11:16:35 +00:00
Martin Stjernholm
455adcb019 Merge "Document that blueprint:"mutated" properties are skipped." am: 9fd2ed93df am: 7cf283232e am: bd3c584db6
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1823195

Change-Id: Id3e35e8e3973df2e13d58717ebc58a7f7cb969e5
2021-09-10 11:03:32 +00:00
Martin Stjernholm
bd3c584db6 Merge "Document that blueprint:"mutated" properties are skipped." am: 9fd2ed93df am: 7cf283232e
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1823195

Change-Id: Ia746ffd8b5d1aaecccc6c0faef672bc19113d7cd
2021-09-10 10:48:41 +00:00
Martin Stjernholm
7cf283232e Merge "Document that blueprint:"mutated" properties are skipped." am: 9fd2ed93df
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1823195

Change-Id: I4c4953ecf617632ed18bd1a682d4a1ff57dc7d25
2021-09-10 10:36:05 +00:00
Martin Stjernholm
9fd2ed93df Merge "Document that blueprint:"mutated" properties are skipped." 2021-09-10 10:17:55 +00:00
Treehugger Robot
4c6e4fc77a Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/blueprint" am: b3ba44c8d3 am: 23621090db am: 2e6b19831c am: 30a238a106
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1822217

Change-Id: I4f5bcc422253783418627c8a8a4e21db8013406c
2021-09-09 23:17:20 +00:00
Treehugger Robot
30a238a106 Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/blueprint" am: b3ba44c8d3 am: 23621090db am: 2e6b19831c
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1822217

Change-Id: I8cf201aa786b61c17e7b07ad2d2ac89ed2857fb9
2021-09-09 22:48:38 +00:00
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
d1db35c2e2 Remove UseValidationsForGoTests. am: d9d298c760 am: f16d2de6d0 am: 06844fc461 am: 6217d0fe53
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1821772

Change-Id: Id19611d1d6f7ccc5a6c9dfc181c9d328c5a0497b
2021-09-09 07:13:22 +00: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
31a3793c7f Remove PrimaryBuilderExtraFlags and cull Args. am: 5d5ed5fc6b am: 32d5d542d2 am: 1ff903cbac am: 1040846cd3
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1819862

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

Change-Id: I307ce37931bba7a4c4b2876ddce1f87a24c95147
2021-09-08 14:22:06 +00: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