Commit graph

2378 commits

Author SHA1 Message Date
Liz Kammer
c3e6a6f229 Add ShellEscapeListIncludingSpaces am: 3a988df18a am: 4a7a93e620 am: f78b492e23
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1894576

Change-Id: I5a4ff115332d913a05370bfccbdc527583ee9825
2021-11-17 02:14:52 +00:00
Liz Kammer
f78b492e23 Add ShellEscapeListIncludingSpaces am: 3a988df18a am: 4a7a93e620
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1894576

Change-Id: I8838ccf45808027ff9cf564ba7f0a8186dcfdb45
2021-11-17 02:02:10 +00:00
Liz Kammer
4a7a93e620 Add ShellEscapeListIncludingSpaces am: 3a988df18a
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1894576

Change-Id: Ibdd319237ef5dd125279ea14fa1d84f53e3d0fcb
2021-11-17 01:46:05 +00:00
Liz Kammer
3a988df18a Add ShellEscapeListIncludingSpaces
This simplifies escaping for aquery.

Test: build/bazel/ci/mixed_droid.sh
Change-Id: I88356a8eda0c6a6ac9426d37cd386f0a94b8818b
2021-11-16 17:17:02 -05:00
Lukacs T. Berki
4ded44b074 Move bpglob to outside of the Ninja action graph. am: 6fbc68d41d am: ffa095e33e am: 47f1fb8fb6 am: e40adf699a am: 5a4b1ac499
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1879698

Change-Id: I7a50f038b9c706fcbd196aa5f42d7289bb1cad56
2021-11-10 18:15:41 +00:00
Lukacs T. Berki
5a4b1ac499 Move bpglob to outside of the Ninja action graph. am: 6fbc68d41d am: ffa095e33e am: 47f1fb8fb6 am: e40adf699a
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1879698

Change-Id: I1dc1ef2cb8b3be4ea8e1e8aba536dd44469e2d50
2021-11-10 18:10:02 +00:00
Lukacs T. Berki
e40adf699a Move bpglob to outside of the Ninja action graph. am: 6fbc68d41d am: ffa095e33e am: 47f1fb8fb6
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1879698

Change-Id: Ie989c6fe4d07055164212c2d13b1ae31bb489faa
2021-11-10 17:53:18 +00:00
Lukacs T. Berki
47f1fb8fb6 Move bpglob to outside of the Ninja action graph. am: 6fbc68d41d am: ffa095e33e
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1879698

Change-Id: Ief88b0735943997a60a724ec18aab913aaf75d30
2021-11-10 17:42:06 +00:00
Lukacs T. Berki
ffa095e33e Move bpglob to outside of the Ninja action graph. am: 6fbc68d41d
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1879698

Change-Id: I67d9c22741b5e9e9816f0273a16f09d6aa00efc0
2021-11-10 17:29:12 +00:00
Lukacs T. Berki
6fbc68d41d Move bpglob to outside of the Ninja action graph.
It's in reality built by Microfactory quite early in the build which
takes care of incrementality in bpglob itself.

Test: Presubmits.
Change-Id: I066a6e85f48e9cfec4efd46cb1f615c68b806080
2021-11-10 12:37:55 +01:00
Xin Li
b5c1eddfac Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918
Bug: 205056467
Merged-In: Ide155fbc4b2a982177f4082d6a27d05ddc9bd675
Change-Id: Ie8925a553b34cad87fda1583784c0158ea65f956
2021-11-10 08:05:30 +00:00
Trevor Radcliffe
b9da7c3830 Merge "Change bpdoc to separate entries with the same type" am: 0bf636f3ef am: 7224b3edcc am: 99169c4274 am: 41183be341 am: 1aade20e7b
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1878636

Change-Id: Ibaface86e8f8d2d3100be38d0bae5282242189ad
2021-11-05 17:40:06 +00:00
Trevor Radcliffe
1aade20e7b Merge "Change bpdoc to separate entries with the same type" am: 0bf636f3ef am: 7224b3edcc am: 99169c4274 am: 41183be341
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1878636

Change-Id: Iec164b071bf3eed464072bc31fb8af8d0a4b8603
2021-11-05 17:13:34 +00:00
Trevor Radcliffe
41183be341 Merge "Change bpdoc to separate entries with the same type" am: 0bf636f3ef am: 7224b3edcc am: 99169c4274
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1878636

Change-Id: I4ed0f4e854cf17b7a123e7d21e746c3e5b803f2d
2021-11-05 17:02:18 +00:00
Trevor Radcliffe
99169c4274 Merge "Change bpdoc to separate entries with the same type" am: 0bf636f3ef am: 7224b3edcc
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1878636

Change-Id: Ie03d438ba24865683c4ad3bcce46c79350f0f174
2021-11-05 16:49:08 +00:00
Trevor Radcliffe
7224b3edcc Merge "Change bpdoc to separate entries with the same type" am: 0bf636f3ef
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1878636

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

Change-Id: Icc8eba79bd90fd28fec96f9d36aa6fdf913874f5
2021-11-04 18:59:50 +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
466a11cbfc Move bpglob out of ToolDir am: 37d151ff95 am: 64310fcea0 am: 669e58631f am: 5832ba46d5 am: 225f06e3fe
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1875757

Change-Id: I95d10dea37b830b87bb8c7cf6e0cda92df01ff82
2021-11-02 22:09:38 +00: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
9674ef5ed9 Handle dangling symlinks when following symlinks am: 0e306e7a89 am: 30faeb6ad6 am: 45480fc84f am: 3153a00579 am: 137655633f
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1851040

Change-Id: Ie36616ec7e0cbd4c8097a0314cd94d7705affbbb
2021-10-11 19:19:25 +00: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
027df05432 Merge "bpdocs for struct types created using reflection" am: 87fd4b11af am: 8c25febaf9 am: 678e2ea12b am: 10ef8ee70c am: 12a4ffc88f
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1820757

Change-Id: Id1887c7a9c7e34be0fd03261ba7e8f85e65da6c8
2021-09-21 21:17:04 +00: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
dfe5fade07 Merge "Document that blueprint:"mutated" properties are skipped." am: 9fd2ed93df am: 7cf283232e am: bd3c584db6 am: 455adcb019 am: 5c41e52f65
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1823195

Change-Id: I686a5fc0f3466ba33cffea2bce099ba92aa0cefa
2021-09-10 11:30:24 +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
ba5bd7b8a4 Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/blueprint" am: b3ba44c8d3 am: 23621090db am: 2e6b19831c am: 30a238a106 am: 4c6e4fc77a
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1822217

Change-Id: Iab2a7500e540fd45de8bcda1cefb1a2277be8c2e
2021-09-09 23:33:10 +00:00