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

82927 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
7e64187e46 Merge "Switch noticeindex from regex to proto." am: 88b02afbf0 
Original change: https://android-review.googlesource.com/c/platform/build/+/2258477

Change-Id: I28604e9b41fe8e39635aa9a7d1205d61dd7e96df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-02 16:41:11 +00: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
7c1d0301fc Merge "sbom_test - use UTC" am: b50b6850b7 
Original change: https://android-review.googlesource.com/c/platform/build/+/2280815

Change-Id: I05f4019a84d013d360f530c2c7bb18436e30daa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-02 07:14:02 +00:00
Treehugger Robot
b50b6850b7 Merge "sbom_test - use UTC" 2022-11-02 05:20:06 +00:00
Treehugger Robot
c10b2f79bd Merge "Concatenate cl hashes so that git revert can revert multiple commits." am: 1ff5e0e34f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2281781

Change-Id: Ib8e1d235e66dfe9c6de332a6732eac63293fe6bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-02 04:50:16 +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
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
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
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
Android Build Coastguard Worker
162b02ebc5 Version bump to TQ1A.221205.011 [core/build_id.mk] 
Change-Id: I91e80ba845c0ca036d2382747682f45fa07d8576
 2022-11-01 23:10:02 +00:00
Treehugger Robot
b9b754e19b Merge "HACK: disable most of the build for riscv64" 2022-11-01 22:52:08 +00:00