Commit Graph

74130 Commits

Author SHA1 Message Date
Treehugger Robot
4fda5ba158 Merge "license metadata remove path on top-down walk" am: 159ae38aaa am: ccfd736eda am: d009ec93e6
Original change: https://android-review.googlesource.com/c/platform/build/+/1915582

Change-Id: Icfaa385e240ff32c7fe33f04091044e8b0ed2c31
2021-12-09 00:54:39 +00:00
Treehugger Robot
d009ec93e6 Merge "license metadata remove path on top-down walk" am: 159ae38aaa am: ccfd736eda
Original change: https://android-review.googlesource.com/c/platform/build/+/1915582

Change-Id: If05f08ddbc579d69b905c6cf9ac9cbf58959b841
2021-12-09 00:36:36 +00:00
Treehugger Robot
ccfd736eda Merge "license metadata remove path on top-down walk" am: 159ae38aaa
Original change: https://android-review.googlesource.com/c/platform/build/+/1915582

Change-Id: I5d4af25da66c92813a13c0653c710d5adbc21109
2021-12-09 00:18:38 +00:00
Treehugger Robot
159ae38aaa Merge "license metadata remove path on top-down walk" 2021-12-08 23:55:26 +00:00
Treehugger Robot
dee8c12a0a Merge "license metadata performance" am: d497acc1c9 am: 1fb8dbd1c8 am: 8b18caeeca
Original change: https://android-review.googlesource.com/c/platform/build/+/1914147

Change-Id: Ic62b514d4959b3104ea58db7a17fc3a880d0df2d
2021-12-08 23:39:16 +00:00
Dan Willemsen
c1c9031b41 Merge "Add basic Darwin+Arm64 support as HOST_CROSS" am: e808bc4a09 am: b66a55ea05 am: e0a90e10b3
Original change: https://android-review.googlesource.com/c/platform/build/+/1883492

Change-Id: I6b3f0939247ac268438a524f8c301e5874f2bf84
2021-12-08 23:38:45 +00:00
Treehugger Robot
8b18caeeca Merge "license metadata performance" am: d497acc1c9 am: 1fb8dbd1c8
Original change: https://android-review.googlesource.com/c/platform/build/+/1914147

Change-Id: I505d4f473fa58aee73d8f0274f8848c20b1e988d
2021-12-08 23:19:43 +00:00
Dan Willemsen
e0a90e10b3 Merge "Add basic Darwin+Arm64 support as HOST_CROSS" am: e808bc4a09 am: b66a55ea05
Original change: https://android-review.googlesource.com/c/platform/build/+/1883492

Change-Id: If56481c18988d0e457b3479814b62ba4bc6e7fef
2021-12-08 23:18:52 +00:00
Treehugger Robot
1fb8dbd1c8 Merge "license metadata performance" am: d497acc1c9
Original change: https://android-review.googlesource.com/c/platform/build/+/1914147

Change-Id: I253cfc5ff436b441c1abe35a6b3069d194bd7dbd
2021-12-08 23:01:12 +00:00
Dan Willemsen
b66a55ea05 Merge "Add basic Darwin+Arm64 support as HOST_CROSS" am: e808bc4a09
Original change: https://android-review.googlesource.com/c/platform/build/+/1883492

Change-Id: If566a5f3a588db74cc6d54d4c107c0f1c88bea4c
2021-12-08 22:59:34 +00:00
Treehugger Robot
d497acc1c9 Merge "license metadata performance" 2021-12-08 21:47:39 +00:00
Dan Willemsen
e808bc4a09 Merge "Add basic Darwin+Arm64 support as HOST_CROSS" 2021-12-08 21:08:43 +00:00
Bob Badour
b285515ca1 license metadata remove path on top-down walk
Performance optimization means not every path will be traversed.

Instead of updating parents via the path, perform a 2nd bottom-up walk
after the top-down walk to propagate the new resolutions to parents.

Note: the 2nd walk method will add resolutions to statically linked
libraries etc. at deeper levels, but those do not affect what gets
reported. In particular, note that test data for dumpresolutions
changes, but none of the test data for listshare, checkshare etc.
changes.

Test: m all systemlicense listshare checkshare dumpgraph dumpresolutions

Bug: 68860345
Bug: 151177513
Bug: 151953481
Change-Id: I76361c4e33bbadbbea38cbec260430e8f9407628
2021-12-08 12:52:59 -08:00
Dan Willemsen
8820840d57 Add basic Darwin+Arm64 support as HOST_CROSS
Soong will use this to turn on universal binary support (X86_64 + Arm64
in the same binary).

Bug: 203607969
Test: m sdk-repo-platform-tools sdk-repo-build-tools on Mac
Change-Id: I04612136a42e85f4add95202ce20e741d9aaa302
2021-12-08 09:26:27 -08:00
Bob Badour
3a820dd5a0 license metadata performance
Tune the top-down walk to avoid needlessly walking the same subtree
over and over again with the same condition(s).

Takes walking system image down from 3m to 1.5s.

Test: m all systemlicense listshare checkshare dumpgraph dumpresolutions

Bug: 68860345
Bug: 151177513
Bug: 151953481

Change-Id: I4354800cd8dfc42efd4df274d2ce45eaa3e0a99f
2021-12-07 15:36:10 -08:00
Treehugger Robot
2f958913d9 Merge "Add missing apksigner dependency" am: 1295bc5138 am: 37d01f684d am: e807b0639a
Original change: https://android-review.googlesource.com/c/platform/build/+/1891388

Change-Id: Icd45553cb33ae8b4568be15f74612bb6ac84d4c3
2021-12-07 13:34:53 +00:00
Treehugger Robot
e807b0639a Merge "Add missing apksigner dependency" am: 1295bc5138 am: 37d01f684d
Original change: https://android-review.googlesource.com/c/platform/build/+/1891388

Change-Id: Ic10a05e9d6004479c4c906c9d07a899754e682aa
2021-12-07 13:21:25 +00:00
Treehugger Robot
37d01f684d Merge "Add missing apksigner dependency" am: 1295bc5138
Original change: https://android-review.googlesource.com/c/platform/build/+/1891388

Change-Id: Ie10a161857ad6ecd4d3d5f2cf5a43a5f2c7a0e00
2021-12-07 12:57:53 +00:00
Treehugger Robot
1295bc5138 Merge "Add missing apksigner dependency" 2021-12-07 11:43:06 +00:00
Treehugger Robot
86518a9506 Merge "Revert "Revert "Move meta_lic files into per-module intermediates directories""" am: 0d8d378bd4 am: 793100509c am: 19acbbea9c
Original change: https://android-review.googlesource.com/c/platform/build/+/1910142

Change-Id: If3bd2e19f01279f92561f091d84bc8c217e9580d
2021-12-07 05:26:00 +00:00
Treehugger Robot
19acbbea9c Merge "Revert "Revert "Move meta_lic files into per-module intermediates directories""" am: 0d8d378bd4 am: 793100509c
Original change: https://android-review.googlesource.com/c/platform/build/+/1910142

Change-Id: Icb4faefc4df0d311c41821e6742d04e76b44ee9f
2021-12-07 05:14:46 +00:00
Treehugger Robot
793100509c Merge "Revert "Revert "Move meta_lic files into per-module intermediates directories""" am: 0d8d378bd4
Original change: https://android-review.googlesource.com/c/platform/build/+/1910142

Change-Id: I36aa20e6861144f547955e4750c43f1cd011ffeb
2021-12-07 04:52:20 +00:00
Treehugger Robot
0d8d378bd4 Merge "Revert "Revert "Move meta_lic files into per-module intermediates directories""" 2021-12-07 04:33:01 +00:00
Treehugger Robot
c4f1a012c9 Merge changes I5d48eaba,I4ff3f988 am: 203bbf3254 am: 195ace0fa6 am: 414d918656
Original change: https://android-review.googlesource.com/c/platform/build/+/1870079

Change-Id: Idff4755a5aa823552f6b670687bd48f7bd20dcf3
2021-12-07 04:15:55 +00:00
Treehugger Robot
414d918656 Merge changes I5d48eaba,I4ff3f988 am: 203bbf3254 am: 195ace0fa6
Original change: https://android-review.googlesource.com/c/platform/build/+/1870079

Change-Id: I08a95f347198e2e7cd671448346c5c8c470d0129
2021-12-07 04:04:50 +00:00
Treehugger Robot
195ace0fa6 Merge changes I5d48eaba,I4ff3f988 am: 203bbf3254
Original change: https://android-review.googlesource.com/c/platform/build/+/1870079

Change-Id: Idaf766bbdb25fa297f742764235a26bd7fe1bd65
2021-12-07 03:48:59 +00:00
Treehugger Robot
55bec85e70 Merge changes I98694001,I5fe57d36 am: ea1a012972 am: a1a1606184 am: 63f1664541
Original change: https://android-review.googlesource.com/c/platform/build/+/1911224

Change-Id: Ib1fd061a19b6a8de7189e69e1b196fce44c5e50e
2021-12-07 03:46:59 +00:00
Treehugger Robot
203bbf3254 Merge changes I5d48eaba,I4ff3f988
* changes:
  compliance package documentation
  compliance package: listshare and checkshare
2021-12-07 03:24:23 +00:00
Treehugger Robot
63f1664541 Merge changes I98694001,I5fe57d36 am: ea1a012972 am: a1a1606184
Original change: https://android-review.googlesource.com/c/platform/build/+/1911224

Change-Id: I56654af3854a39e732af1e520a2a057e83445bf4
2021-12-07 03:23:47 +00:00
Treehugger Robot
a1a1606184 Merge changes I98694001,I5fe57d36 am: ea1a012972
Original change: https://android-review.googlesource.com/c/platform/build/+/1911224

Change-Id: Icc0b5417b5d874a1c57a0a75dc1c10307a6b6320
2021-12-07 03:08:04 +00:00
Treehugger Robot
ea1a012972 Merge changes I98694001,I5fe57d36
* changes:
  compliance package: dumpresolutions
  compliance package for license metadata: dumpgraph
2021-12-07 02:55:12 +00:00
Bob Badour
afaeb6ae5f compliance package documentation
Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Test: m systemlicense
Test: m listshare; out/soong/host/linux-x86/bin/listshare ...
Test: m checkshare; out/soong/host/linux-x86/bin/checkshare ...
Test: m dumpgraph; out/soong/host/linux-x86/dumpgraph ...
Test: m dumpresolutions; out/soong/host/linux-x86/dumpresolutions ...

where ... is the path to the .meta_lic file for the system image. In my
case if

$ export PRODUCT=$(realpath $ANDROID_PRODUCT_OUT --relative-to=$PWD)

... can be expressed as:

${PRODUCT}/gen/META/lic_intermediates/${PRODUCT}/system.img.meta_lic

Change-Id: I5d48eababce7bba39795d3668eee86b332cbe43d
2021-12-06 16:39:35 -08:00
Bob Badour
6dd0035e04 compliance package: listshare and checkshare
package to read, consume, and analyze license metadata and dependency
graph.

Includes the below command-line tools:

listshare outputs csv of projects to share to meet restricted and
reciprocal license requirements with one project per line. The first
field is the path to the project, and subsequent fields identify the
license resolutions as colon-separated target:annotations tuples.

checkshare outputs error messages to stderr for any targets where
policy dictates both sharing and not sharing the source-code, and PASS
or FAIL to stdout. exit status indicates success 0 or conflict found 1

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Test: m systemlicense
Test: m listshare; out/soong/host/linux-x86/bin/listshare ...
Test: m checkshare; out/soong/host/linux-x86/bin/checkshare ...
Test: m dumpgraph; out/soong/host/linux-x86/dumpgraph ...
Test: m dumpresolutions; out/soong/host/linux-x86/dumpresolutions ...

where ... is the path to the .meta_lic file for the system image. In my
case if

$ export PRODUCT=$(realpath $ANDROID_PRODUCT_OUT --relative-to=$PWD)

... can be expressed as:

${PRODUCT}/gen/META/lic_intermediates/${PRODUCT}/system.img.meta_lic

Change-Id: I4ff3f98848f7e6d03a35734300d763ef5f245d53
2021-12-06 16:39:35 -08:00
Bob Badour
1ded0a1b18 compliance package: dumpresolutions
package to read, consume, and analyze license metadata and dependency
graph.

Includes the below command-line tool:

dumpresolutions outputs the resulting set of resolutions after the
bottom-up and top-down resolves, or after joining 1 or more condition
walks.

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Test: m systemlicense
Test: m dumpgraph; out/soong/host/linux-x86/dumpgraph ...
Test: m dumpresolutions; out/soong/host/linux-x86/dumpresolutions ...

where ... is the path to the .meta_lic file for the system image. In my
case if

$ export PRODUCT=$(realpath $ANDROID_PRODUCT_OUT --relative-to=$PWD)

... can be expressed as:

${PRODUCT}/gen/META/lic_intermediates/${PRODUCT}/system.img.meta_lic

Change-Id: I9869400126cd7ad4b7376b0bab31b46aad732f5d
2021-12-06 16:38:08 -08:00
Bob Badour
fa739da020 compliance package for license metadata: dumpgraph
package to read, consume, and analyze license metadata and dependency
graph.

Includes testdata/ and the the below command-line tool:

dumpgraph outputs edges of the graph as "target dependency annotations"

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Test: m systemlicense
Test: m dumpgraph; out/soong/host/linux-x86/dumpgraph ...

where ... is the path to the .meta_lic file for the system image. In my
case if

$ export PRODUCT=$(realpath $ANDROID_PRODUCT_OUT --relative-to=$PWD)

... can be expressed as:

${PRODUCT}/gen/META/lic_intermediates/${PRODUCT}/system.img.meta_lic

Change-Id: I5fe57d361da5155dbcb2c0d369626e9200c9d664
2021-12-06 16:37:17 -08:00
Treehugger Robot
715fb15bce Merge "[cc/sanitize] Re-enable new pass manager for fuzzer targets" am: e813a4a023 am: 9498b39594 am: 0caa8245fb
Original change: https://android-review.googlesource.com/c/platform/build/+/1908951

Change-Id: Ia8b49b7e941b1ed61781762683f76a51513d5cbe
2021-12-06 22:19:06 +00:00
Treehugger Robot
0caa8245fb Merge "[cc/sanitize] Re-enable new pass manager for fuzzer targets" am: e813a4a023 am: 9498b39594
Original change: https://android-review.googlesource.com/c/platform/build/+/1908951

Change-Id: I976e98dad4b31b96705d3bcf237a52bdc425206f
2021-12-06 22:06:28 +00:00
Treehugger Robot
9498b39594 Merge "[cc/sanitize] Re-enable new pass manager for fuzzer targets" am: e813a4a023
Original change: https://android-review.googlesource.com/c/platform/build/+/1908951

Change-Id: Ief74d2d1faf733bab6a86fed95cceea956c4ad03
2021-12-06 21:42:56 +00:00
Treehugger Robot
e813a4a023 Merge "[cc/sanitize] Re-enable new pass manager for fuzzer targets" 2021-12-06 21:40:10 +00:00
Cole Faust
e867718c2c Merge "Pass input variables to product config" am: 8fb2d83457 am: d8b85632e3 am: c9f7aa1c4b
Original change: https://android-review.googlesource.com/c/platform/build/+/1908233

Change-Id: Idb066dfdad1199ef3d5605f991ca12b5859b7985
2021-12-05 04:49:47 +00:00
Cole Faust
c9f7aa1c4b Merge "Pass input variables to product config" am: 8fb2d83457 am: d8b85632e3
Original change: https://android-review.googlesource.com/c/platform/build/+/1908233

Change-Id: Icc6546da1253859e2bb2e94657839a3002a654b0
2021-12-05 04:26:13 +00:00
Cole Faust
d8b85632e3 Merge "Pass input variables to product config" am: 8fb2d83457
Original change: https://android-review.googlesource.com/c/platform/build/+/1908233

Change-Id: I182cdec2014ebf8409ad192c1ffd82b2cda7cf5f
2021-12-05 04:05:50 +00:00
Cole Faust
8fb2d83457 Merge "Pass input variables to product config" 2021-12-05 03:43:24 +00:00
Daeho Jeong
dbfaf3bbe3 Merge "Add erofs tools in target" am: 9a26cdbccd am: 3bda74b77e am: 5748c5679e
Original change: https://android-review.googlesource.com/c/platform/build/+/1908037

Change-Id: Ib7ef9e7abeaf044ea5f3c96091cf74cd63f3e9fc
2021-12-04 05:50:29 +00:00
Daeho Jeong
5748c5679e Merge "Add erofs tools in target" am: 9a26cdbccd am: 3bda74b77e
Original change: https://android-review.googlesource.com/c/platform/build/+/1908037

Change-Id: I8fb56c8b23d395eabaa2652ebb8f4d8c2f1dfb25
2021-12-04 05:37:49 +00:00
Daeho Jeong
3bda74b77e Merge "Add erofs tools in target" am: 9a26cdbccd
Original change: https://android-review.googlesource.com/c/platform/build/+/1908037

Change-Id: Idfce5a9c0945b59833ba12117e07d2e685768934
2021-12-04 05:21:07 +00:00
Daeho Jeong
9a26cdbccd Merge "Add erofs tools in target" 2021-12-04 05:04:15 +00:00
Treehugger Robot
a24332dbde Merge "compliance package policy and resolves" am: 45deca7ff7 am: e7d26816bb am: dfd9be96ce
Original change: https://android-review.googlesource.com/c/platform/build/+/1870078

Change-Id: I7dd037c6a97b9e5c778cc04feff1169571410d27
2021-12-04 04:18:22 +00:00
Treehugger Robot
dfd9be96ce Merge "compliance package policy and resolves" am: 45deca7ff7 am: e7d26816bb
Original change: https://android-review.googlesource.com/c/platform/build/+/1870078

Change-Id: I9b279f3a0a47517440cca2beba7c028f7c9e02fb
2021-12-04 04:07:12 +00:00
Treehugger Robot
e7d26816bb Merge "compliance package policy and resolves" am: 45deca7ff7
Original change: https://android-review.googlesource.com/c/platform/build/+/1870078

Change-Id: Ied21f22a1230f7865aad360c9bf77aadccd9fffa
2021-12-04 03:45:35 +00:00