StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
100,275 Commits 1 Branch 0 Tags
be37d3f911a94ecff51e55346aa5cfdda290c36c
Commit Graph

100275 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
be37d3f911 Merge "Fix problem of RepackApexPayload when using option --signing_args" into main am: 2f0d0b861b am: 213b09e38a 
Original change: https://android-review.googlesource.com/c/platform/build/+/3221018

Change-Id: I5fe9070820813c788e1cbd079528d8e746162120
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-22 18:19:01 +00:00
Treehugger Robot
213b09e38a Merge "Fix problem of RepackApexPayload when using option --signing_args" into main am: 2f0d0b861b 
Original change: https://android-review.googlesource.com/c/platform/build/+/3221018

Change-Id: Ic808716b0265425e19d0a71a9ef1f7c610655270
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-22 18:12:03 +00:00
Treehugger Robot
2f0d0b861b Merge "Fix problem of RepackApexPayload when using option --signing_args" into main 2024-08-22 18:01:13 +00:00
Treehugger Robot
714862cfe9 Merge "Re-generate 4K boot OTAs using signed boot.img during signing process" into main am: 939326d3be am: f574cfe03c 
Original change: https://android-review.googlesource.com/c/platform/build/+/3236656

Change-Id: I9553ea87761d440e84a03c34373bd0a5e0d1069e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-22 17:24:00 +00:00
Treehugger Robot
f574cfe03c Merge "Re-generate 4K boot OTAs using signed boot.img during signing process" into main am: 939326d3be 
Original change: https://android-review.googlesource.com/c/platform/build/+/3236656

Change-Id: Iddf44f50417927611bc9a7094da657c06a6f211f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-22 17:17:39 +00:00
Treehugger Robot
939326d3be Merge "Re-generate 4K boot OTAs using signed boot.img during signing process" into main 2024-08-22 17:09:06 +00:00
Treehugger Robot
1cb5415d27 Merge "Add "TARGET_BOARD_PLATFORM" into soong_variables" into main am: 60f5f54e64 am: 1def8d2f31 
Original change: https://android-review.googlesource.com/c/platform/build/+/3235102

Change-Id: I0323cdf13654ee8281d53e7fc98121b23859e58c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-22 05:56:28 +00:00
Treehugger Robot
1def8d2f31 Merge "Add "TARGET_BOARD_PLATFORM" into soong_variables" into main am: 60f5f54e64 
Original change: https://android-review.googlesource.com/c/platform/build/+/3235102

Change-Id: I8e0c4fcf6c52c5047807f2a79a9d3a6e7e69a2c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-22 05:48:55 +00:00
Treehugger Robot
60f5f54e64 Merge "Add "TARGET_BOARD_PLATFORM" into soong_variables" into main 2024-08-22 05:43:38 +00:00
Wei Li
026b95cb0f Merge "Use TARGET_OUT instead of TARGET_OUT_SYSTEM" into main am: 25b5c1c1b7 am: 6c50877096 
Original change: https://android-review.googlesource.com/c/platform/build/+/3219095

Change-Id: Ia9a102564c39e2aa43628f2bf0ef9e6991ed3dce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-22 00:55:53 +00:00
Wei Li
6c50877096 Merge "Use TARGET_OUT instead of TARGET_OUT_SYSTEM" into main am: 25b5c1c1b7 
Original change: https://android-review.googlesource.com/c/platform/build/+/3219095

Change-Id: If78c96e30dea700d9bb30578f859846a4f2e6e3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-22 00:48:37 +00:00
Wei Li
25b5c1c1b7 Merge "Use TARGET_OUT instead of TARGET_OUT_SYSTEM" into main 2024-08-22 00:40:32 +00:00
Hugo Drumond Jacob
8ac4fba6ab Merge "Revert "Add a coverage suffix to avoid Ninja file regeneration."" into main am: 9d42ae9a3d am: 7c955bc371 
Original change: https://android-review.googlesource.com/c/platform/build/+/3235973

Change-Id: Ic5a24a0db1b1fe3e850c3c00e6e53bdbffd8230f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-21 17:38:04 +00:00
Kelvin Zhang
b707ea0206 Re-generate 4K boot OTAs using signed boot.img during signing process 
Currently, dev option OTAs are generated using dev-key signed boot.img
On release-key devices, OTA will install successfully, but user would be
using dev-key signed boot image after reverting to 4K mode, and
subsequent OTAs would fail. This CL re-generates 4K boot OTA using
release-key signed boot.img , which allows normal OTAs after toggling
dev options.

Test: th
Bug: 354019928
Change-Id: I40811d6ed7a37f50edea77d245bf559b66da5a71
 2024-08-21 10:36:57 -07:00
Hugo Drumond Jacob
7c955bc371 Merge "Revert "Add a coverage suffix to avoid Ninja file regeneration."" into main am: 9d42ae9a3d 
Original change: https://android-review.googlesource.com/c/platform/build/+/3235973

Change-Id: I0df29702941720436bb091087b734a5e23883ab5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-21 17:31:43 +00:00
Hugo Drumond Jacob
9d42ae9a3d Merge "Revert "Add a coverage suffix to avoid Ninja file regeneration."" into main 2024-08-21 17:20:34 +00:00
Hugo Drumond Jacob
d69e11ee3c Revert "Add a coverage suffix to avoid Ninja file regeneration." 
Revert submission 3207217-emma-flip-time-saver

Reason for revert: b/361236607

Reverted changes: /q/submissionid:3207217-emma-flip-time-saver

Change-Id: Id2e415232221baf2015b8170ceb64ee6f8d3f160
 2024-08-21 13:07:09 +00:00
Jerome Gaillard
bf87744078 Merge "Add overlay files to layoutlib res.zip" into main am: d93f559871 am: b0a67ce2df 
Original change: https://android-review.googlesource.com/c/platform/build/+/3228769

Change-Id: I5c1b10f0424a4b4727792e80e90a591426c4be36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-21 09:07:55 +00:00
Jerome Gaillard
b0a67ce2df Merge "Add overlay files to layoutlib res.zip" into main am: d93f559871 
Original change: https://android-review.googlesource.com/c/platform/build/+/3228769

Change-Id: Ie112b2e3818b497a2feae30f83f3c15a704e21ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-21 09:02:23 +00:00
Jerome Gaillard
d93f559871 Merge "Add overlay files to layoutlib res.zip" into main 2024-08-21 08:56:09 +00:00
Herbert Xue
ad9d8e7169 Add "TARGET_BOARD_PLATFORM" into soong_variables 
Bug: 360872208
Bug: 348120216
Test: aosp_cf_x86_64_phone-trunk_staging-eng && m hosttar
Change-Id: Ie5f630818c5bd538265a969abbb50f1fbe255f91
 2024-08-21 13:00:21 +08:00
Treehugger Robot
bfbe6ce4a1 Merge "Don't pack target tests into art-host-tests.zip." into main am: cb56fa972b am: 9ebd27ffcc 
Original change: https://android-review.googlesource.com/c/platform/build/+/3232722

Change-Id: I98d2cf4de9cb9c80281e0c4d3842c08f5bb3cac9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-20 21:50:26 +00:00
Treehugger Robot
9f3fd5b5a8 Merge "make/core/Makefile: Skip images for local builds by default." into main am: f38c15ab8e am: 0117ccddad 
Original change: https://android-review.googlesource.com/c/platform/build/+/3211136

Change-Id: I43bf5f610e2df364d9b52efff4cc6768d03c78cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-20 21:47:45 +00:00
Treehugger Robot
7d540014cc Merge "Add rbc version of soong_config_set_bool" into main am: 273f97b5a3 am: 4a876883ff 
Original change: https://android-review.googlesource.com/c/platform/build/+/3229149

Change-Id: Ied2dd9c5c50a6029f2552a454c7f91ca2c2bd67f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-20 21:46:34 +00:00
Qing Shen
9f0471dd15 Merge "Add a coverage suffix to avoid Ninja file regeneration." into main am: ca2fe2cd81 am: 61ea5ce877 
Original change: https://android-review.googlesource.com/c/platform/build/+/3206456

Change-Id: Id76c9428d9897bc1fda8bb8a0f743315caeea40b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-20 21:46:14 +00:00
Treehugger Robot
298d2d844d Merge "Move large_screen_common.mk to AOSP" into main am: 7337727e7a am: 8867cacc31 
Original change: https://android-review.googlesource.com/c/platform/build/+/3220401

Change-Id: I7d54b20835e4661930473609dc35ad7ec4e9197b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-20 21:43:31 +00:00
Xin Li
8850a4e314 [automerger skipped] Merge "Merge aosp-24Q3-ts-dev" into aosp-main-future am: 9a3ec3465e -s ours 
am skip reason: Merged-In Ia1f94ba19bab1f2e3b129827ad5634023290dbc5 with SHA-1 0ddd61a73f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/28853291

Change-Id: Ib655fecd24e77a9cf96d50db603ee4c3650c5b4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-20 21:40:17 +00:00
Xin Li
68f183edba [automerger skipped] Merge aosp-24Q3-ts-dev am: d18271c0c2 -s ours 
am skip reason: Merged-In Ia1f94ba19bab1f2e3b129827ad5634023290dbc5 with SHA-1 0ddd61a73f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/28853291

Change-Id: I2846f5b3665ccf2fbb568bc2522a14d852f4b766
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-20 21:39:57 +00:00
Treehugger Robot
9ebd27ffcc Merge "Don't pack target tests into art-host-tests.zip." into main am: cb56fa972b 
Original change: https://android-review.googlesource.com/c/platform/build/+/3232722

Change-Id: I35a32d11772af64517381b65564b849f50eecdd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-20 17:22:37 +00:00
Treehugger Robot
cb56fa972b Merge "Don't pack target tests into art-host-tests.zip." into main 2024-08-20 17:14:47 +00:00
Treehugger Robot
0117ccddad Merge "make/core/Makefile: Skip images for local builds by default." into main am: f38c15ab8e 
Original change: https://android-review.googlesource.com/c/platform/build/+/3211136

Change-Id: Ic6d952283a654d9de5c380dbf670e62f4bf242f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-20 17:05:39 +00:00
Treehugger Robot
f38c15ab8e Merge "make/core/Makefile: Skip images for local builds by default." into main 2024-08-20 16:48:51 +00:00
Jiakai Zhang
7731accb15 Don't pack target tests into art-host-tests.zip. 
art-host-tests.mk packs target tests into art-host-tests.zip. This
behavior has been there since the very first version
(https://r.android.com/1437898).

Today, this behavior normally does nothing because target tests are
included in the ART testing apex and therefore not visible to Make.
However, if we remove any target tests from the ART testing apex, this
behavior will start to cause problems (b/360150490), as it will pack
those removed target tests into art-host-tests.zip and continous testing
will fail to run them.

This change removes this behavior.

Bug: 357802879
Bug: 169111770
Bug: 360150490
Test: `m art-host-tests` and see that the output is bit-identical with
  and without the change.
Change-Id: I2e9abdf4ed51bd8dc91637d7502350dfafb4aa39
 2024-08-20 14:47:58 +00:00
Jerome Gaillard
c97c0b4a7c Add overlay files to layoutlib res.zip 
This adds resource overlay files to the res.zip file created by
layoutlib_data.mk. This also updates the script generating the
corresponding SBOM file.

Bug: 335355919
Test: m layoutlib
Change-Id: I2427be23720324eb03bd428d220b8777e3bf49bb
 2024-08-20 13:37:41 +01:00
Treehugger Robot
4a876883ff Merge "Add rbc version of soong_config_set_bool" into main am: 273f97b5a3 
Original change: https://android-review.googlesource.com/c/platform/build/+/3229149

Change-Id: Ib0f6f2e65e9854b1cb9bfd346ed37e16793bea0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-20 01:37:26 +00:00
Treehugger Robot
273f97b5a3 Merge "Add rbc version of soong_config_set_bool" into main 2024-08-20 01:32:07 +00:00
Qing Shen
61ea5ce877 Merge "Add a coverage suffix to avoid Ninja file regeneration." into main am: ca2fe2cd81 
Original change: https://android-review.googlesource.com/c/platform/build/+/3206456

Change-Id: I2a80cc6e4aa094fe35cb7529b7be483dc396e1a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-20 01:19:53 +00:00
Qing Shen
ca2fe2cd81 Merge "Add a coverage suffix to avoid Ninja file regeneration." into main 2024-08-20 01:16:53 +00:00
Cole Faust
88eeea5b2e Add rbc version of soong_config_set_bool 
Bug: 342006386
Test: go test
Change-Id: Icd885bc576715f650c02d7f4043e6ace8842f0da
 2024-08-19 17:35:31 -07:00
Treehugger Robot
8867cacc31 Merge "Move large_screen_common.mk to AOSP" into main am: 7337727e7a 
Original change: https://android-review.googlesource.com/c/platform/build/+/3220401

Change-Id: I296e3dad3c329af54bef78d68448c377ab683eb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-19 22:39:30 +00:00
Xin Li
9a3ec3465e Merge "Merge aosp-24Q3-ts-dev" into aosp-main-future 2024-08-19 22:38:56 +00:00
Treehugger Robot
7337727e7a Merge "Move large_screen_common.mk to AOSP" into main 2024-08-19 22:05:21 +00:00
Alex Klein
af49729c5a make/core/Makefile: Skip images for local builds by default. 
Packing and archiving the image are expensive operations.
Swap the image archive to dist-files for builders, and skip
building the raw image locally unless it's specifically
requested via the new PHONY targets.

Bug: None
Test: m, m dist, m pack-image
Change-Id: I2a3f1ebea689c23da88ca6d0757b827b7eb0c936
 2024-08-19 11:43:06 -06:00
Siarhei Vishniakou
a6488974f6 Add libmonkey_jni to base 
The monkey package is already part of "base" build. In this topic, we
are adding jni support to monkey, which will allow us to use libinput's
uinput infrastructure for motion injection.

In this CL, we also need to add libmonkey_jni to the base build. Without
this change, monkey fails to find the jni library, because 'flashall'
does not include this .so by default.

However, this change is not needed when running 'adb sync', which
correctly recognizes that the jni library is required and places it in
the right place on the device.

Bug: 344695913
Flag: EXEMPT refactor
Ignore-AOSP-First: relies on uinput infra not available in aosp
Test: adb shell monkey 1000 --pct-touch 100
Test: m && vendor/google/tools/flashall -w --disable_verity=true
Change-Id: Id6c381895e914f0c0ab8278fad31e82734f48cf5
 2024-08-19 09:58:16 -07:00
Prochin Wang
14e20a0a3f Merge "Add trendy team for Pixel Troubleshooting App" into main am: 104b7e4967 am: aefcbf683c 
Original change: https://android-review.googlesource.com/c/platform/build/+/3222583

Change-Id: Idb5cada1db5419ac828df9d763d44de8f5812e58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-18 15:34:30 +00:00
Prochin Wang
aefcbf683c Merge "Add trendy team for Pixel Troubleshooting App" into main am: 104b7e4967 
Original change: https://android-review.googlesource.com/c/platform/build/+/3222583

Change-Id: Ie6e9c542c5fb7ab55d254b269458c42b3d975744
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-18 15:14:36 +00:00
Prochin Wang
104b7e4967 Merge "Add trendy team for Pixel Troubleshooting App" into main 2024-08-18 14:59:04 +00:00
Prochin Wang
9cdac7ae1e Add trendy team for Pixel Troubleshooting App 
Bug: 360332619
Test: m
Change-Id: I2ba6fb2009186b0ba439c66e348f65050e684ed2
 2024-08-17 14:42:02 +00:00
Ankur Bakshi
99678b8092 [automerger skipped] Update Security String to 2024-10-01 am: 65e3548527 am: 4c4c240d68 am: 5ba07e338c am: 206ad86920 am: 7b12323ac0 am: f401ed0a40 am: 8abae0d891 am: 117e8cf24d -s ours am: 7c0d437167 -s ours am: 44a4c2e9bc -s ours am: 75a5506bca -s ours 
am skip reason: Merged-In I45ca948c56b15f58d06f87850c5ddda6fa713cba with SHA-1 65e3548527 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/28848233

Change-Id: If96fa0af3239b52d0d3790f021efd209a15c9a4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 23:56:11 +00:00
Ankur Bakshi
8ee1b31276 [automerger skipped] Update Security String to 2024-10-01 am: 65e3548527 am: 4c4c240d68 am: 5ba07e338c am: 206ad86920 am: 7b12323ac0 am: f401ed0a40 am: 3b23dc3b67 am: 971db7e147 am: d88e48203e am: ec6871ee5b -s ours 
am skip reason: Merged-In I45ca948c56b15f58d06f87850c5ddda6fa713cba with SHA-1 65e3548527 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/28848233

Change-Id: I7b2ab77916bd3ff4212bbf4afc0af61c9fa2152e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 23:55:38 +00:00