Commit graph

80740 commits

Author SHA1 Message Date
Alex Buynytskyy
8361b3a13f Only revert until the latest baseline.
Bug: 243966946
Test: run locally
Change-Id: I1d64054cd4beab1fd737cbc5fc47879f3c6ff21a
2022-11-07 17:33:17 +00:00
SzuWei Lin
576c382c78 Merge "Support system_dlkm in GSI" 2022-11-07 14:15:21 +00:00
Islam Elbanna
4fbebb6d9d Merge "Zip apex system server and standalone system server jars into system_server.zip." 2022-11-07 11:40:52 +00:00
SzuWei Lin
1c31b049c9 Support system_dlkm in GSI
From Android 13, all devices must include a system_dlkm partition.
The patch enables system_dlkm on all GSI targets to support the devices
with system_dlkm partition, and be compatible with old devices
without a system_dlkm partition.

With patch, there is no /system/system_dlkm, and add a symlink
/system/lib/modules -> /system_dlkm/lib/modules

Bug: 256984997
Test: make gsi_arm64-user and aosp_arm64-user; check system folder
Change-Id: I2453ec43d584423cc4d5f0e23405f0ae9b6c5c90
2022-11-07 18:13:31 +08:00
Remi NGUYEN VAN
542672d797 Merge "Add libconnectivity_native to LLNDK" 2022-11-07 02:07:45 +00:00
Treehugger Robot
e32ad5e482 Merge "Convert soong_to_convert.py to python 3" 2022-11-05 03:34:03 +00:00
Cole Faust
5865420eb1 Convert soong_to_convert.py to python 3
Bug: 203436762
Test: m out/target/product/emulator_x86_64/soong_to_convert.txt
Change-Id: Ibf8d80a160315ed03a11fbeef66a630b224bea0a
2022-11-04 17:36:13 -07:00
Colin Cross
9091700e3d Merge "aosp_riscv64: inherit from default products that don't break the build" 2022-11-05 00:30:05 +00:00
Kevin Dagostino
d1e43a8d7c Merge "export tradefed .xml templates for tests" 2022-11-04 19:40:20 +00:00
Colin Cross
dd9e1e40a3 aosp_riscv64: inherit from default products that don't break the build
Uncomment everything in aosp_riscv64.mk that doesn't break the
aosp_riscv64-userdebug build.

Test: m droid dist
Change-Id: I29b07d74fb8e93848bd422287e9cfaa32bde6d93
2022-11-04 17:25:54 +00:00
Bob Badour
8eeff2b0b8 Merge "Fix final nits from noticeindex change." 2022-11-04 16:57:01 +00:00
Islam Elbanna
ab52f4baaa Zip apex system server and standalone system server jars into system_server.zip.
Currently, the Art benchmark service is depending on the boot.zip file
to filter out boot image profiles based on the existing jars in this zip
file, and to expand profiling to apex system server jars and standalone
jars we need to export these jars in another zip file.

Bug: 241823638
Test: Checked the generated `system_server.zip` using `m droidcore dist`
Test: Checked with aosp and internal targets
Change-Id: I477dcfd3381bd24bdc50aabb773b38f8840f0ce0
2022-11-04 15:52:37 +00:00
Treehugger Robot
92716d2d59 Merge "Add init.environ.rc to aosp_riscv64" 2022-11-04 04:03:13 +00:00
Colin Cross
ceca93acb0 Add init.environ.rc to aosp_riscv64
init.environ.rc has a postinstall command to create the symlinks in
and directories in the root filesystem.  Without those packaging
target-files.zip fails with:
failed to find system in canned fs_config

Bug: 250918230
Test: lunch aosp_riscv64-userdebug && m installclean && m droid dist
Change-Id: Iccb6ba53a3caa918431119230256a01d4919f1cc
2022-11-04 00:22:26 +00:00
Dennis Shen
1c1a075006 Merge "Update deapexer extract call with more input" 2022-11-03 22:54:49 +00:00
Treehugger Robot
b6bb694958 Merge "Use 'ours' conflict resolution strategy." 2022-11-03 22:32:31 +00:00
Alex Buynytskyy
92f501aef7 Use 'ours' conflict resolution strategy.
We should never use anything from finalization commits.

Bug: 243966946
Test: run locally
Change-Id: I4b0cedd7e82362cc98961e627d0103cfba18fc6d
2022-11-03 12:29:06 -07:00
Alex Buynytskyy
ac60bcdaaf Merge "Better cleanup and revert." 2022-11-03 18:18:23 +00:00
Dennis Shen
44b714b7ca Update deapexer extract call with more input
BUG: b/255963179, b/240288941
Change-Id: Id7f5eb20e4c6f3c3e793860389f4be48f4f3938f
2022-11-03 17:39:04 +00:00
Jiakai Zhang
4b9babc12c Merge "Revert "Zip apex system server and standalone system server jars into system_server.zip."" 2022-11-03 15:55:12 +00:00
Jiakai Zhang
64c4a419c2 Revert "Zip apex system server and standalone system server jars into system_server.zip."
This reverts commit 8503760df9.

Reason for revert: Broke build https://android-build.googleplex.com/builds/pending/P43406477/aosp_arm64-userdebug/latest/view/logs/build_error.log

Change-Id: Ifd51a17e4e608a885a0e0cd146e2c20fe7e5eabb
2022-11-03 15:16:10 +00:00
Alex Buynytskyy
739a311cc6 Better cleanup and revert.
Bug: 243966946
Test: run locally
Change-Id: I09f7cb19bb7f97d807a75189bf75e7c2fd25edee
2022-11-03 14:43:58 +00:00
Islam Elbanna
29c6a75025 Merge "Zip apex system server and standalone system server jars into system_server.zip." 2022-11-03 14:10:47 +00:00
Treehugger Robot
cecd960ee9 Merge "Do not force rebuilds after changing host kernel." 2022-11-03 06:19:52 +00:00
Kevin Dagostino
ceacee8525 export tradefed .xml templates for tests
Test: xml files are usable by the tradefed rule.
Change-Id: Ifef40fb6cf6a4e5e4be6541dc031628409a710ee
2022-11-03 05:31:28 +00:00
Peter Collingbourne
0d06f702dd Do not force rebuilds after changing host kernel.
Change-Id: I0c62eda893531853e6d192f6551a919d10e12acd
2022-11-02 15:44:14 -07:00
Colin Cross
e2137bae02 Merge "Switch from init to init_system to match base_system.mk" 2022-11-02 21:10:47 +00:00
Colin Cross
2fc08445ac Switch from init to init_system to match base_system.mk
Using init instead of init_system causes a failure packaging
target-files.zip:
failed to find system in canned fs_config

Switching to init_system seems to fix it.

Test: lunch aosp_riscv64-userdebug && m droid dist
Change-Id: Ia2cf2ef1b85c2e63076f70132f2cce64828c5c93
2022-11-02 18:15:08 +00:00
Bob Badour
3afc3004f2 Fix final nits from noticeindex change.
Test: m droid dist cts alllicensemetadata
Change-Id: Ie446e5693a09f4ae1c936cdae6f1e668105541f0
2022-11-02 10:24:04 -07:00
Bob Badour
88b02afbf0 Merge "Switch noticeindex from regex to proto." 2022-11-02 15:46:38 +00:00
Islam Elbanna
8503760df9 Zip apex system server and standalone system server jars into system_server.zip.
Currently, the Art benchmark service is depending on the boot.zip file
to filter out boot image profiles based on the existing jars in this zip
file, and to expand profiling to apex system server jars and standalone
jars we need to export these jars in another zip file.

Bug: 241823638
Test: Check the generated `system_server.zip` using `m droidcore dist`
Change-Id: Ief2c92588b5e4f6ccd5163ece8d241bc473b22ad
2022-11-02 12:34:22 +00:00
Treehugger Robot
b50b6850b7 Merge "sbom_test - use UTC" 2022-11-02 05:20:06 +00:00
Treehugger Robot
1ff5e0e34f Merge "Concatenate cl hashes so that git revert can revert multiple commits." 2022-11-02 04:22:05 +00:00
Maciej Żenczykowski
458f90272c sbom_test - use UTC
Test: TreeHugger, m compliance_sbom
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Id2abec8537a1dfa32d6816da4c34c86f46313086
2022-11-01 19:49:05 -07:00
Treehugger Robot
324ad55c0a Merge "Hack aosp_riscv64 config to fix m droid dist" 2022-11-02 02:18:05 +00:00
Alex Buynytskyy
07bc317c45 Concatenate cl hashes so that git revert can revert multiple commits.
Bug: 243966946
Test: run locally
Change-Id: I59bd588f5368f8e47fd9272b561b63d940e1072d
2022-11-01 18:45:51 -07:00
Treehugger Robot
99d607c0ad Merge "Unconditionally generate build_manifest.pb" 2022-11-01 23:50:05 +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
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
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
9fac7000ec Merge "move logtags rule from //build/make to //build/bazel" 2022-11-01 13:50:10 +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
5667fe0a74 Merge "Allow RO build only for readonly mount points" 2022-10-31 22:58:32 +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