StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
91,451 Commits 1 Branch 0 Tags
ac1535d4a78f8ef013e57aa7e5f9f141dacc6bcc
Commit Graph

91451 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ken Chen
b0c598838c Merge "Revert "Add 16k/4k boot OTAs to /system partition"" into main am: 7a6468edd5 am: 4f6a32d86f am: 62c7a824a9 
Original change: https://android-review.googlesource.com/c/platform/build/+/2734334

Change-Id: Iadac26809bbd85b08ad2ede160d3bd96539ac79b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 05:01:52 +00:00
Ken Chen
62c7a824a9 Merge "Revert "Add 16k/4k boot OTAs to /system partition"" into main am: 7a6468edd5 am: 4f6a32d86f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2734334

Change-Id: Ic2bd5bf73c9cc00a294305bb976f5990655d8b02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 04:14:06 +00:00
Kelvin Zhang
d0406b8d01 Merge "Add 16k/4k boot OTAs to /system partition" into main am: ee8b6cf22d am: 9e02776e5c am: 1fadfdf0aa am: 06af034044 am: 1b3f1f8811 
Original change: https://android-review.googlesource.com/c/platform/build/+/2734615

Change-Id: If76670d3eb2dedfae8a761955f8d6e25e27543e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 03:27:42 +00:00
Ken Chen
4f6a32d86f Merge "Revert "Add 16k/4k boot OTAs to /system partition"" into main am: 7a6468edd5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2734334

Change-Id: I27fc3fe1df0c32b433d8d347330acd3cf1551836
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 03:22:46 +00:00
Ken Chen
7a6468edd5 Merge "Revert "Add 16k/4k boot OTAs to /system partition"" into main 2023-08-31 02:57:25 +00:00
Ken Chen
2610f34671 Revert "Add 16k/4k boot OTAs to /system partition" 
This reverts commit a2674525ae.

Reason for revert: Investigate b/298295675

Change-Id: Ia44137695d6e9a1b99f4cc6e4dcc88bd3b4156db
 2023-08-31 02:38:02 +00:00
Kelvin Zhang
1b3f1f8811 Merge "Add 16k/4k boot OTAs to /system partition" into main am: ee8b6cf22d am: 9e02776e5c am: 1fadfdf0aa am: 06af034044 
Original change: https://android-review.googlesource.com/c/platform/build/+/2734615

Change-Id: I38502cf852e99d658bf83b1a2849dfb5ec4a7bf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 02:28:02 +00:00
Kelvin Zhang
06af034044 Merge "Add 16k/4k boot OTAs to /system partition" into main am: ee8b6cf22d am: 9e02776e5c am: 1fadfdf0aa 
Original change: https://android-review.googlesource.com/c/platform/build/+/2734615

Change-Id: Ic769501a8ca84f855cf778f83288e06e916d1f99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 01:50:21 +00:00
Kelvin Zhang
1fadfdf0aa Merge "Add 16k/4k boot OTAs to /system partition" into main am: ee8b6cf22d am: 9e02776e5c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2734615

Change-Id: Icb65bac269c97397a29aa37a191bdaf034916ba6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 01:03:57 +00:00
Cole Faust
b35231ece0 Build the proguard dict zip without PACKAGING intermediates 
Before, as each module was built, it would dump its proguard-related
files into the PACKAGING folder. Then the rule for the final distable
zip would zip up this whole folder. This means that if you built a
module that was not part of the system, and then rebuilt the final
zip, it would erronously include more proguard files than necessary.
This problem was worked around by relying on CI to run `m installclean`
every time.

Now, the zip proguard files always include the same information.

This also makes it so that when you build a module, its proguard files
are not copied to the PACKAGING folder, making builds that don't
build the final proguard zips slightly faster.

Bug: 205632228
Test: diff'd proguard-dict.zip, proguard-dict-mapping.textproto, and proguard-usage.zip before/after this cl on sdk_phone_x86_64. They have diffs, but only in the order of files / lines.

Change-Id: I98c02e1eb117c337ba9b98f04ad486597eb9bb86
 2023-08-30 17:17:19 -07:00
Kelvin Zhang
9e02776e5c Merge "Add 16k/4k boot OTAs to /system partition" into main am: ee8b6cf22d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2734615

Change-Id: I8e2113ae0c1ccb488171fbd3dc0d87cdc78ea548
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-31 00:10:34 +00:00
Kelvin Zhang
ee8b6cf22d Merge "Add 16k/4k boot OTAs to /system partition" into main 2023-08-30 23:30:01 +00:00
Treehugger Robot
7abd0a15d0 Merge "make fake_device_config buildable on host" into main am: f153237a03 am: 0a60fcee26 am: 6afd2c6dec am: 34db649459 am: 817f228864 
Original change: https://android-review.googlesource.com/c/platform/build/+/2734157

Change-Id: I294c0de4a21b1d904c6c3fcd94e6eafa4db3d8a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-30 23:25:51 +00:00
Treehugger Robot
817f228864 Merge "make fake_device_config buildable on host" into main am: f153237a03 am: 0a60fcee26 am: 6afd2c6dec am: 34db649459 
Original change: https://android-review.googlesource.com/c/platform/build/+/2734157

Change-Id: Ibf8fff399528cbdd6498748d882308c91c142583
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-30 22:25:00 +00:00
Treehugger Robot
34db649459 Merge "make fake_device_config buildable on host" into main am: f153237a03 am: 0a60fcee26 am: 6afd2c6dec 
Original change: https://android-review.googlesource.com/c/platform/build/+/2734157

Change-Id: I7a48ae18bcf7cc18c3c2d9fea5be75bb3263c717
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-30 21:50:06 +00:00
Treehugger Robot
6afd2c6dec Merge "make fake_device_config buildable on host" into main am: f153237a03 am: 0a60fcee26 
Original change: https://android-review.googlesource.com/c/platform/build/+/2734157

Change-Id: Ia2599afebdfe07dbc218d4c18917c1747e2a1d3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-30 21:03:11 +00:00
Treehugger Robot
0a60fcee26 Merge "make fake_device_config buildable on host" into main am: f153237a03 
Original change: https://android-review.googlesource.com/c/platform/build/+/2734157

Change-Id: I2f847e86600ad023f02697c3e5459c86de7c610b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-30 20:11:53 +00:00
Kelvin Zhang
a2674525ae Add 16k/4k boot OTAs to /system partition 
This allows switching kernels without downloading anything from
internet.

Test: th
Bug: 293313353
Change-Id: I29e48dc191091930a7d0a690924b37c572fa9356
 2023-08-30 13:06:17 -07:00
Treehugger Robot
f153237a03 Merge "make fake_device_config buildable on host" into main 2023-08-30 19:44:39 +00:00
Joe Onorato
cede86dd28 make fake_device_config buildable on host 
Test: treehugger
Bug: 277916185
Change-Id: I002669bbb605b7968b81c66d1cbf0ff3caa0c699
Merged-In: I002669bbb605b7968b81c66d1cbf0ff3caa0c699
 2023-08-30 11:39:29 -07:00
Romain Jobredeaux
bec914598f Expose global proguard flags for use by R8. 
Bug: 293304784
Test: CI
Change-Id: I0e30f3e1affc2493cb63cb94266ad0a6b636ebc8
 2023-08-30 11:48:52 -04:00
Treehugger Robot
79a4bf9e7d Merge "Add timestamp to 16K boot OTA" into main am: 132be7e516 am: f45586061b am: 4bc6c177a5 am: ecb98c83ff am: ffd057c727 
Original change: https://android-review.googlesource.com/c/platform/build/+/2726999

Change-Id: Ic11e75bb7f41726a77b75d46243e803fe3cb93a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-30 07:15:59 +00:00
Treehugger Robot
99bd70e2c0 Merge "Sign the 16K boot image OTA" into main am: 7090051129 am: 9aa1182af0 am: 0c21e53cac am: 8919d335ae am: 3e93666e81 
Original change: https://android-review.googlesource.com/c/platform/build/+/2726997

Change-Id: I56b9c690e3a564e4a01cc28e3bf8810d7ba47f1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-30 07:15:00 +00:00
Treehugger Robot
ffd057c727 Merge "Add timestamp to 16K boot OTA" into main am: 132be7e516 am: f45586061b am: 4bc6c177a5 am: ecb98c83ff 
Original change: https://android-review.googlesource.com/c/platform/build/+/2726999

Change-Id: Ic9aa2fe78b980934c3812d170f0d5a7bb10e9bab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-30 06:16:35 +00:00
Treehugger Robot
3e93666e81 Merge "Sign the 16K boot image OTA" into main am: 7090051129 am: 9aa1182af0 am: 0c21e53cac am: 8919d335ae 
Original change: https://android-review.googlesource.com/c/platform/build/+/2726997

Change-Id: I225b22fab77d264aa70a66176e3e3ca3dd5325af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-30 06:15:45 +00:00
Treehugger Robot
ecb98c83ff Merge "Add timestamp to 16K boot OTA" into main am: 132be7e516 am: f45586061b am: 4bc6c177a5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2726999

Change-Id: Icfd9a466d420a9cbdfabbd62802d81ea5a42c02d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-30 05:40:01 +00:00
Treehugger Robot
8919d335ae Merge "Sign the 16K boot image OTA" into main am: 7090051129 am: 9aa1182af0 am: 0c21e53cac 
Original change: https://android-review.googlesource.com/c/platform/build/+/2726997

Change-Id: I49834e7e99416b3fd6e53f7664ae40dac3c8ae6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-30 05:39:37 +00:00
Treehugger Robot
4bc6c177a5 Merge "Add timestamp to 16K boot OTA" into main am: 132be7e516 am: f45586061b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2726999

Change-Id: I6acb117a65c812cdb856b082aad7f0247270329e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-30 04:52:55 +00:00
Treehugger Robot
0c21e53cac Merge "Sign the 16K boot image OTA" into main am: 7090051129 am: 9aa1182af0 
Original change: https://android-review.googlesource.com/c/platform/build/+/2726997

Change-Id: Iad93f27046942a39fa0dfbb442c17ebdf9979abe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-30 04:52:38 +00:00
Treehugger Robot
f45586061b Merge "Add timestamp to 16K boot OTA" into main am: 132be7e516 
Original change: https://android-review.googlesource.com/c/platform/build/+/2726999

Change-Id: I2286092b17ee5290db318b1726dfc28b6250197e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-30 04:49:01 +00:00
Treehugger Robot
132be7e516 Merge "Add timestamp to 16K boot OTA" into main 2023-08-30 04:11:29 +00:00
Treehugger Robot
9aa1182af0 Merge "Sign the 16K boot image OTA" into main am: 7090051129 
Original change: https://android-review.googlesource.com/c/platform/build/+/2726997

Change-Id: Iacfba38bbfad9cdd644dc4e555f31100ce4f2451
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-30 04:01:16 +00:00
Treehugger Robot
7090051129 Merge "Sign the 16K boot image OTA" into main 2023-08-30 03:26:41 +00:00
Kelvin Zhang
506a30851e Add timestamp to 16K boot OTA 
Test: th
Bug: 297536338
Change-Id: Id4919d2437079e36899cd4c56da011a29aa0b470
 2023-08-29 19:38:19 -07:00
Jerry Jia
648d2cb5f2 Merge "Add libaconfig_python_proto target for Mobly host-based tests" into main am: e40f2800af am: dac2660623 am: cf22b07f13 am: 5ebab20aec am: 29aaf1bab7 
Original change: https://android-review.googlesource.com/c/platform/build/+/2726480

Change-Id: I96ea0bdeeca2548ea7394485fe9a979c31e3866f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-30 02:25:48 +00:00
Kelvin Zhang
ed60c9da27 Sign the 16K boot image OTA 
Sign the 16K OTA package so that it can be installed by device.

Test: th
Bug: 293313353
Change-Id: I2f1f6f5430fc920d5edeeab3f3335cbdf76fdefd
 2023-08-29 19:18:49 -07:00
Jerry Jia
29aaf1bab7 Merge "Add libaconfig_python_proto target for Mobly host-based tests" into main am: e40f2800af am: dac2660623 am: cf22b07f13 am: 5ebab20aec 
Original change: https://android-review.googlesource.com/c/platform/build/+/2726480

Change-Id: Ibd8e4d17fdc0dc43e2072c130f1b975cf22feb31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-30 01:29:20 +00:00
Zhi Dou
770b66a2f8 Merge "aconfig: generate full fakefeatureflagsimpl in prod mode" into main am: 401be560de am: f1b494624c am: 017ad46fa9 am: f6287509ed am: bb9bbfa9ed 
Original change: https://android-review.googlesource.com/c/platform/build/+/2709686

Change-Id: Ie90d5c998295ba9cf1eda21968e0839f08b49655
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-30 00:51:49 +00:00
Jerry Jia
5ebab20aec Merge "Add libaconfig_python_proto target for Mobly host-based tests" into main am: e40f2800af am: dac2660623 am: cf22b07f13 
Original change: https://android-review.googlesource.com/c/platform/build/+/2726480

Change-Id: Id6e40438341cffc44291a03270e63808faf5cf4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-30 00:51:35 +00:00
Jerry Jia
cf22b07f13 Merge "Add libaconfig_python_proto target for Mobly host-based tests" into main am: e40f2800af am: dac2660623 
Original change: https://android-review.googlesource.com/c/platform/build/+/2726480

Change-Id: I4c03f5f5cc797c887ddf377824e5b56f969f3a34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-30 00:04:44 +00:00
Cole Faust
2b22fcf1c9 Merge "Add dexpreopt files to ALL_MODULES.$(m).INSTALLED" into main am: 303d7da643 am: 377f554483 am: 44780b4d82 am: 951fba8681 am: 48f079b167 
Original change: https://android-review.googlesource.com/c/platform/build/+/2729625

Change-Id: Ibcc09d99a310824392f01eeb3eb245efe09d9be1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-30 00:04:42 +00:00
Treehugger Robot
d26bd40396 Merge "ota_from_target_files requires apexd_host" into main am: 4b00773378 am: 6ca8e44d67 am: e870af4571 am: 1ab20b50d7 am: 393786bcb2 
Original change: https://android-review.googlesource.com/c/platform/build/+/2730213

Change-Id: Ic172bbb52b1d92df84bac9cf5401927b9ab8f082
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 23:28:03 +00:00
Treehugger Robot
0c74b18920 Merge "Update vndk list 34.txt" into udc-dev-plus-aosp am: 89f0428c87 am: 24175526f1 am: f3e72aa8df 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24581788

Change-Id: I790ef71ab8c50123ae4fe87c731b17d77cae242a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 23:15:27 +00:00
Jerry Jia
dac2660623 Merge "Add libaconfig_python_proto target for Mobly host-based tests" into main am: e40f2800af 
Original change: https://android-review.googlesource.com/c/platform/build/+/2726480

Change-Id: Ib5049d49260af3763aa77ace9117924655afc3ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 23:13:15 +00:00
Cole Faust
9ff7a37096 Don't read the odex zip files when building sbom-metadata.csv 
The files inside the odex zip files are now part of $(installed_files)
as of aosp/2729625.

Bug: 205632228
Test: m out/target/product/emulator_x86_64/sbom-metadata.csv, before this cl you can find duplicate entries for the odex files. After this cl there's only 1
Change-Id: I1645bd1bb9e1f10fc3746225a15b8431b666580e
 2023-08-29 15:39:10 -07:00
Jerry Jia
e40f2800af Merge "Add libaconfig_python_proto target for Mobly host-based tests" into main 2023-08-29 22:33:32 +00:00
Treehugger Robot
ba3dc799cb Merge "Use board api level for seapp coredomain check" into main am: c8c6cbbb27 am: d6e3f50ed0 am: 54dead2799 am: 63ebf56ee1 am: 87283d346d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2727597

Change-Id: I8eecc3da8f465f27a02e6de118a9f4d5f0a5b3aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 22:28:19 +00:00
Xin Li
1fae5a8fba [automerger skipped] Merge "Merge Android U (ab/10368041)" into aosp-main-future am: c76319f88c -s ours am: c3d8d0e9cd -s ours am: 186be73acc -s ours am: 23999bb670 -s ours 
am skip reason: Merged-In If9360ebd0acebe85f42f89a268c316d51c765708 with SHA-1 4a80353011 is already in history

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

Change-Id: If5780bb078e61c3ad5a313b55cf57312bb84563a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 20:42:40 +00:00
Xin Li
6327f422d9 [automerger skipped] Merge Android U (ab/10368041) am: be1435290d -s ours am: 9f54ee44ba -s ours am: 16be255ad8 -s ours am: f7c145610c -s ours 
am skip reason: Merged-In If9360ebd0acebe85f42f89a268c316d51c765708 with SHA-1 4a80353011 is already in history

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

Change-Id: Ic96cce3b412185140147ae8e390f32a15aa5b4aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 20:37:53 +00:00
Zhi Dou
bb9bbfa9ed Merge "aconfig: generate full fakefeatureflagsimpl in prod mode" into main am: 401be560de am: f1b494624c am: 017ad46fa9 am: f6287509ed 
Original change: https://android-review.googlesource.com/c/platform/build/+/2709686

Change-Id: I062dfd1b63f8567e667307cef2aca413ce0a42a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 16:38:22 +00:00