Commit Graph

82509 Commits

Author SHA1 Message Date
Treehugger Robot
73d4032ca5 Merge "Hack aosp_riscv64 config to fix m droid dist" am: 324ad55c0a am: 1fc32534d7
Original change: https://android-review.googlesource.com/c/platform/build/+/2281222

Change-Id: Ie02481ab7f33e5145b31c35a8a067b1b1aa74eff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-02 03:52:50 +00:00
Treehugger Robot
1fc32534d7 Merge "Hack aosp_riscv64 config to fix m droid dist" am: 324ad55c0a
Original change: https://android-review.googlesource.com/c/platform/build/+/2281222

Change-Id: I3d9a10c5d1eecd6247bc83820d6243bdd99e4fdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-02 02:56:21 +00:00
Treehugger Robot
324ad55c0a Merge "Hack aosp_riscv64 config to fix m droid dist" 2022-11-02 02:18:05 +00:00
Treehugger Robot
1acd79f839 Merge "Unconditionally generate build_manifest.pb" am: 99d607c0ad am: 45263b0159
Original change: https://android-review.googlesource.com/c/platform/build/+/2281220

Change-Id: I267e422c8fe8b89fe484623e996fd11383104574
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-02 00:18:02 +00:00
Ibrahim Kanouche
4cfcd0a550 Merge "Added SBOM generator module to implement the spdx utility bill of material" am: 1bb27903e8 am: ec2ee88c50
Original change: https://android-review.googlesource.com/c/platform/build/+/2265084

Change-Id: I01b7baf0c2749a27e94e7dc1968e499b297462c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-02 00:17:51 +00:00
Treehugger Robot
fe07d6d590 Merge "HACK: disable most of the build for riscv64" am: b9b754e19b am: 2fbfed8bdc
Original change: https://android-review.googlesource.com/c/platform/build/+/2281221

Change-Id: I0434291a8c3f331e97955fc6ff636a8ba5e9d391
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-02 00:17:36 +00:00
Treehugger Robot
45263b0159 Merge "Unconditionally generate build_manifest.pb" am: 99d607c0ad
Original change: https://android-review.googlesource.com/c/platform/build/+/2281220

Change-Id: Ib9eace3def0f3827fa1f5829a3347af099179a26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-02 00:03:57 +00:00
Treehugger Robot
99d607c0ad Merge "Unconditionally generate build_manifest.pb" 2022-11-01 23:50:05 +00:00
Ibrahim Kanouche
ec2ee88c50 Merge "Added SBOM generator module to implement the spdx utility bill of material" am: 1bb27903e8
Original change: https://android-review.googlesource.com/c/platform/build/+/2265084

Change-Id: Ied2015791fc1f2072bbb2d04c368d8c0ea1b8abc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-01 23:48:58 +00:00
Ibrahim Kanouche
1bb27903e8 Merge "Added SBOM generator module to implement the spdx utility bill of material" 2022-11-01 23:36:22 +00:00
Treehugger Robot
2fbfed8bdc Merge "HACK: disable most of the build for riscv64" am: b9b754e19b
Original change: https://android-review.googlesource.com/c/platform/build/+/2281221

Change-Id: I6c13bbc1392a1fdcff070a93bc82ac3a484240b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-01 23:34:10 +00:00
Colin Cross
aef92033bc Hack aosp_riscv64 config to fix m droid dist
`m droid dist` fails on hiddenapi rules missing bootclasspath classes,
add default_art_config.mk to set PRODUCT_BOOT_JARS, and then override
PRODUCT_USES_DEFAULT_ART_CONFIG back to false to avoid a dependency
from the boot.zip dist artifact to dex2oat, which doesn't work for
riscv64 yet.

Test: lunch aosp_riscv64-userdebug && m droid dist
Change-Id: Icc332ee9132568251386ec742932f6708312bb92
2022-11-01 16:12:27 -07:00
Treehugger Robot
b9b754e19b Merge "HACK: disable most of the build for riscv64" 2022-11-01 22:52:08 +00:00
Jihoon Kang
acefaf25bb Merge "Create custom diff tool to compare stub contents" am: eb35b48df7 am: 16b6c42e17
Original change: https://android-review.googlesource.com/c/platform/build/+/2277211

Change-Id: I9ee457088d77b4b66aaa8da2bf52839c3a17de19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-01 21:38:15 +00:00
Jihoon Kang
16b6c42e17 Merge "Create custom diff tool to compare stub contents" am: eb35b48df7
Original change: https://android-review.googlesource.com/c/platform/build/+/2277211

Change-Id: I75e018530a44325a3c44f3f1a859f862e4947e41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-01 21:07:59 +00:00
Ibrahim Kanouche
bedf1a8a86 Added SBOM generator module to implement the spdx
utility bill of material

Added methods to graph.go to extract the annotation types

Test: m compliance_sbom

Test: tested against real targets, see go/paste/4932131502424064

Bug: 241591242
Change-Id: I344c15d64cd034d72076f9d9a677e593e288e3a6
2022-11-01 20:42:01 +00:00
Jihoon Kang
eb35b48df7 Merge "Create custom diff tool to compare stub contents" 2022-11-01 20:32:20 +00:00
Colin Cross
f310841384 HACK: disable most of the build for riscv64
Disable most of the inherited product makefiles so that `m droid`
passes, and then add back a few working packages to PRODUCT_PACKAGES.

Test: lunch aosp_riscv64-userdebug && m droid
Change-Id: Ifbc4758735ec29876cbdd5a2ec97dd99aaebc210
2022-11-01 12:08:05 -07:00
Victor Hsieh
921d3b0f11 Unconditionally generate build_manifest.pb
Previously, the file is generated only if there's interesting files. The
condition isn't really desirable in build rule evaluation, and makes it
a bit harder to handle in the consuming code.

Bug: 256793394
Test: atest ComposHostTestCases odsign_e2e_tests
Change-Id: I87b257b6ce6ab0ba565378c885adf35c1d25235b
2022-11-01 11:08:31 -07:00
Sam Delmerico
95f31f0aad Merge "move logtags rule from //build/make to //build/bazel" am: 9fac7000ec am: 643efde50f
Original change: https://android-review.googlesource.com/c/platform/build/+/2055110

Change-Id: I607b54b2ecaa9d06d55860b8942106a512a7c5f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-01 14:34:07 +00:00
Sam Delmerico
643efde50f Merge "move logtags rule from //build/make to //build/bazel" am: 9fac7000ec
Original change: https://android-review.googlesource.com/c/platform/build/+/2055110

Change-Id: Ief8c1a848bfd7bb0f103a10b56d34b2f4ed16797
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-01 14:04:15 +00:00
Sam Delmerico
9fac7000ec Merge "move logtags rule from //build/make to //build/bazel" 2022-11-01 13:50:10 +00:00
Treehugger Robot
b017eb73f0 Merge "Check packages/modules before packing otatools keys" am: 2b392dd8ed am: f0a814fa06
Original change: https://android-review.googlesource.com/c/platform/build/+/2280187

Change-Id: I9c0e1bdeda8a2f0effd31c8ff5b51376c11d3663
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-01 06:51:26 +00:00
Treehugger Robot
f0a814fa06 Merge "Check packages/modules before packing otatools keys" am: 2b392dd8ed
Original change: https://android-review.googlesource.com/c/platform/build/+/2280187

Change-Id: I2c4a67865a46bda70dfd4fb3668a4925a67bf83f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-01 06:22:17 +00:00
Treehugger Robot
2b392dd8ed Merge "Check packages/modules before packing otatools keys" 2022-11-01 05:59:52 +00:00
Hongguang
07babe080a Check packages/modules before packing otatools keys
Fix build error when packages/modules is not existed.

Bug: 256565230
Test: make dist, check otatools.zip
Change-Id: I4153b143e677e35f95a3d47663cb8efcde7abdbf
2022-11-01 00:33:25 +00:00
Treehugger Robot
5fce1aa9ab Merge "Allow RO build only for readonly mount points" am: 5667fe0a74 am: 72c68e8518
Original change: https://android-review.googlesource.com/c/platform/build/+/2274606

Change-Id: Ic742a8ebc234f1dad701b948f740e014a962d690
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-01 00:08:51 +00:00
Treehugger Robot
72c68e8518 Merge "Allow RO build only for readonly mount points" am: 5667fe0a74
Original change: https://android-review.googlesource.com/c/platform/build/+/2274606

Change-Id: Ia6d8ab61560e655129f0210d854a83b3ea2455d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31 23:39:54 +00:00
Treehugger Robot
5667fe0a74 Merge "Allow RO build only for readonly mount points" 2022-10-31 22:58:32 +00:00
Treehugger Robot
3202a68458 Merge "Pack the mainline modules test keys into the otatools.zip" am: fb5f2de383 am: 504b57de34
Original change: https://android-review.googlesource.com/c/platform/build/+/2276848

Change-Id: I4ffa64ab1e8b39ce1dfc605e42f45a379ad1bbbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31 20:55:18 +00:00
Treehugger Robot
7d8c81f4e2 Merge changes I381ee79e,Ie30edbb2 am: 83ac0bf9c4 am: 91d8d4a764
Original change: https://android-review.googlesource.com/c/platform/build/+/2277489

Change-Id: I933754ad927358e87738cfefc01acebf8b3e40e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31 20:54:42 +00:00
Treehugger Robot
504b57de34 Merge "Pack the mainline modules test keys into the otatools.zip" am: fb5f2de383
Original change: https://android-review.googlesource.com/c/platform/build/+/2276848

Change-Id: I225dff7f9467a9dcff5253c08a4dab50a8984de1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31 20:27:48 +00:00
Treehugger Robot
91d8d4a764 Merge changes I381ee79e,Ie30edbb2 am: 83ac0bf9c4
Original change: https://android-review.googlesource.com/c/platform/build/+/2277489

Change-Id: Ice02fe30b2d0568260113196fe5fc07839c2cf03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31 20:27:07 +00:00
Treehugger Robot
fb5f2de383 Merge "Pack the mainline modules test keys into the otatools.zip" 2022-10-31 20:21:11 +00:00
Treehugger Robot
83ac0bf9c4 Merge changes I381ee79e,Ie30edbb2
* changes:
  Replace nil-able *sync.Waitgroup with sync.Once
  Fix top-down resolve re-walking graph too much.
2022-10-31 19:58:35 +00:00
Hongguang
547812d318 Pack the mainline modules test keys into the otatools.zip
Bug: 256565230
Test: make dist, check otatools.zip
Change-Id: I7c386ee8f8e3ec6f3d5c767504e23cb1f1bacad2
2022-10-31 10:25:29 -07:00
Anton Hansson
d8cdd931c9 Merge "Revert^2 "Update naming of platforms subdir"" am: 0cd509a08a am: 8bc854f604
Original change: https://android-review.googlesource.com/c/platform/build/+/2276626

Change-Id: Ic4164480f693501c2387183e54df7ddc041a80f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31 13:55:55 +00:00
Martin Stjernholm
152a88b8ca Merge "Add allowlist patterns for dexpreopted files." am: e279ae7226 am: dad6ae3cd9
Original change: https://android-review.googlesource.com/c/platform/build/+/2267725

Change-Id: I03ad484e614bdb2725feb463dea539456acee990
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31 13:51:53 +00:00
Anton Hansson
8bc854f604 Merge "Revert^2 "Update naming of platforms subdir"" am: 0cd509a08a
Original change: https://android-review.googlesource.com/c/platform/build/+/2276626

Change-Id: I61daac318096e00dfb1ce1fbeed5fb9298d34938
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31 13:24:54 +00:00
Martin Stjernholm
dad6ae3cd9 Merge "Add allowlist patterns for dexpreopted files." am: e279ae7226
Original change: https://android-review.googlesource.com/c/platform/build/+/2267725

Change-Id: I0da781c31909b29d05390f8c91ab74014de1ae43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31 13:24:30 +00:00
Anton Hansson
0cd509a08a Merge "Revert^2 "Update naming of platforms subdir"" 2022-10-31 12:57:30 +00:00
Martin Stjernholm
e279ae7226 Merge "Add allowlist patterns for dexpreopted files." 2022-10-31 11:52:10 +00:00
Dennis Song
e3c9c5dc52 Merge "Add the path of GSI document in gsi_release.mk" am: 70bcc91169 am: 06c00902b0
Original change: https://android-review.googlesource.com/c/platform/build/+/2267203

Change-Id: Ica9fd77ca169656d1d2a358aaa5a41214bf5dfb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31 02:52:11 +00:00
Dennis Song
06c00902b0 Merge "Add the path of GSI document in gsi_release.mk" am: 70bcc91169
Original change: https://android-review.googlesource.com/c/platform/build/+/2267203

Change-Id: I52ed5e00fc89312b5523c7791fe187caeda8db1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31 02:24:16 +00:00
Dennis Song
70bcc91169 Merge "Add the path of GSI document in gsi_release.mk" 2022-10-31 01:35:03 +00:00
Bob Badour
5c12c66769 Replace nil-able *sync.Waitgroup with sync.Once
Simplifies synchronization and eliminates lock for nil waitroup.

Test: m droid

Test: m out/soong/.intermediates/packages/modules/StatsD/apex/com.android.os.statsd/android_common_com.android.os.statsd_image/NOTICE.html.gz

Change-Id: I381ee79e142214e7331241071f076db2f7960ba6
2022-10-29 22:48:13 -07:00
Bob Badour
d2c28ba897 Fix top-down resolve re-walking graph too much.
Firing off multiple concurrent walks of the same sub-tree with the same
conditions. Data race meant every walk would proceed. Move the logic to
entry of walk function and compare under lock.

Bug: 255526010

Test: m droid

Test: m out/soong/.intermediates/packages/modules/StatsD/apex/com.android.os.statsd/android_common_com.android.os.statsd_image/NOTICE.html.gz

Change-Id: Ie30edbb2ac9eaa9aa55badfc518d51eaadbb6be6
2022-10-29 22:27:49 -07:00
Treehugger Robot
4b155dd726 Merge "Add some documentation and simplify data model." am: aff9f3a77c am: 56d8afce40
Original change: https://android-review.googlesource.com/c/platform/build/+/2277208

Change-Id: I8b4decc05364f39e72caefa450fae5cca89d855a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-29 09:01:21 +00:00
Treehugger Robot
56d8afce40 Merge "Add some documentation and simplify data model." am: aff9f3a77c
Original change: https://android-review.googlesource.com/c/platform/build/+/2277208

Change-Id: I85e46720b805af3e755c649964389b1fa091198e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-29 07:44:19 +00:00
Treehugger Robot
aff9f3a77c Merge "Add some documentation and simplify data model." 2022-10-29 06:57:52 +00:00