tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
82467 commits 1 branch 0 tags 119 MiB
Commit graph

82467 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dennis Shen
ae9b1f1c70 Merge "add EROFS apex support." am: 2e62ca1a68 
Original change: https://android-review.googlesource.com/c/platform/build/+/2290115

Change-Id: Ia23bf23d382ffff5bc58ace4146e049fee7a3c22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-07 20:45:24 +00:00
Treehugger Robot
3c83bc5c2c Merge "Only revert until the latest baseline." am: fbb395442c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2289886

Change-Id: I3b8c6562e538086f48a81c10a6b309ed1f43b65d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-07 20:45:08 +00:00
Dennis Shen
2e62ca1a68 Merge "add EROFS apex support." 2022-11-07 20:40:55 +00:00
Dennis Shen
f58e548943 add EROFS apex support. 
Signing code uses deapexer to expand payload image, deapexer currently
only supports ext4 payload image expansion using debugfs or
debugfs_static. To support EROFS, need to supply deapexer with
fsck.erofs native binary for EROFS payload expansion.

cherrypick of ag/20154950BUG: b/195515562, b/240288941
Change-Id: Ibf707989f2502bfcf112202a3a6fdb74b6a8dbbc
 2022-11-07 20:40:41 +00:00
Treehugger Robot
fbb395442c Merge "Only revert until the latest baseline." 2022-11-07 20:21:27 +00:00
Dennis Shen
888539c4c8 Add missing fsck.erofs and blkid to OTATOOLS 
BUG: b/257882042
Change-Id: I9821106d45fa6c66f7482be2d0cdd605fe61706f
 2022-11-07 18:56:47 +00:00
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
2f1130f31e Merge "Support system_dlkm in GSI" am: 576c382c78 
Original change: https://android-review.googlesource.com/c/platform/build/+/2287293

Change-Id: I58467ca9d18848b65ce5dd764ab137bc730216a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-07 14:51:38 +00:00
SzuWei Lin
576c382c78 Merge "Support system_dlkm in GSI" 2022-11-07 14:15:21 +00:00
Islam Elbanna
a8c84ad568 Merge "Zip apex system server and standalone system server jars into system_server.zip." am: 4fbebb6d9d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2287335

Change-Id: I605ab1aea0b3b9c09dd7a5ed32eb6150cc0590e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-07 12:06:42 +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
8521eca84e Add the path of GSI document in gsi_release.mk 
Documents for GSI specific packages can be found at
device/generic/common/README.md.

Bug: 256984997
Test: TH
Change-Id: I62bfeea292050773c9d12cd753357dda836b07b0
 2022-11-07 18:13:44 +08: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
92851a2a0f Merge "Add libconnectivity_native to LLNDK" am: 542672d797 
Original change: https://android-review.googlesource.com/c/platform/build/+/2057370

Change-Id: If0aa00cc386e31e0004083bd1109fc52ab8a1aa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-07 02:08:30 +00:00
Remi NGUYEN VAN
542672d797 Merge "Add libconnectivity_native to LLNDK" 2022-11-07 02:07:45 +00:00
Treehugger Robot
f8b7826c59 Merge "Convert soong_to_convert.py to python 3" am: e32ad5e482 
Original change: https://android-review.googlesource.com/c/platform/build/+/2288542

Change-Id: I4eda08308a76a034161fc804dd4c165dbfee723b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-05 04:14:23 +00:00
Treehugger Robot
e32ad5e482 Merge "Convert soong_to_convert.py to python 3" 2022-11-05 03:34:03 +00:00
Colin Cross
7b7af991bc Merge "aosp_riscv64: inherit from default products that don't break the build" am: 9091700e3d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2287164

Change-Id: Ifb94b5e25e2d1cadef2e73379217326282775dda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-05 01:15:15 +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
db929e2933 Merge "export tradefed .xml templates for tests" am: d1e43a8d7c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2282245

Change-Id: I252145a53318e8f52732b5ded93086f645a9a6f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-04 20:11:59 +00:00
Kevin Dagostino
d1e43a8d7c Merge "export tradefed .xml templates for tests" 2022-11-04 19:40:20 +00:00
Bob Badour
2af8146c81 Merge "Fix final nits from noticeindex change." am: 8eeff2b0b8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2283060

Change-Id: I988adc0eaa15a9c89f4d6dba2f2368297e12b5cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-04 17:53:05 +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
70869ab0f2 Merge "Add init.environ.rc to aosp_riscv64" am: 92716d2d59 
Original change: https://android-review.googlesource.com/c/platform/build/+/2286573

Change-Id: I500b60ea9cf169cd06d8b4e4794a9c39f26fa198
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-04 04:40:02 +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
9d483f08df Merge "Update deapexer extract call with more input" am: 1c1a075006 
Original change: https://android-review.googlesource.com/c/platform/build/+/2283058

Change-Id: I1f8303706235d819ecbdd9482756f1b216c066c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-03 23:39:56 +00:00
Treehugger Robot
3d4bc62f3b Merge "Use 'ours' conflict resolution strategy." am: b6bb694958 
Original change: https://android-review.googlesource.com/c/platform/build/+/2285753

Change-Id: I38baef692c8f94ee650fc33263230004c6a38ae4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-03 23:39:20 +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
c59857883e Merge "Better cleanup and revert." am: ac60bcdaaf 
Original change: https://android-review.googlesource.com/c/platform/build/+/2283395

Change-Id: I3931e77c548ed3f6f32b3d80eff3fc071cee0191
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-03 19:12:30 +00: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
72b21a0a2f Merge "Revert "Zip apex system server and standalone system server jars into system_server.zip."" am: 4b9babc12c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2284333

Change-Id: Ifa02441564fbf78e01e65dc627dc97eb01f97d77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-03 16:37:22 +00:00
Ibrahim Kanouche
a68ed086ab Optimized project selection for getProjectMetadata 
Test: m compliance_sbom

Change-Id: I9e60b7e138a4fca74170954d8bb83862677e750f
 2022-11-03 16:01:13 +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
Islam Elbanna
cf9ba27c19 Merge "Zip apex system server and standalone system server jars into system_server.zip." am: 29c6a75025 
Original change: https://android-review.googlesource.com/c/platform/build/+/2281287

Change-Id: I6be0b175feef6033dce3ddd4234ae2a12d82d8ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-03 14:52:53 +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
666fb15733 Merge "Do not force rebuilds after changing host kernel." am: cecd960ee9 
Original change: https://android-review.googlesource.com/c/platform/build/+/2283394

Change-Id: I90d6eb79a399a5821fd03fa6cbe852479d6ddf01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-03 06:57:22 +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
b67fdb4f94 Merge "Switch from init to init_system to match base_system.mk" am: e2137bae02 
Original change: https://android-review.googlesource.com/c/platform/build/+/2282796

Change-Id: If6f65e0508cbbe93b9f006ba1738a92a7a6fa49e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-02 21:36:00 +00:00
Colin Cross
e2137bae02 Merge "Switch from init to init_system to match base_system.mk" 2022-11-02 21:10:47 +00:00