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

91126 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xin Li
ebf868a0a8 [automerger skipped] Merge "Merge UP1A.230905.019" into aosp-main-future am: 236f2cd5e3 -s ours am: 6b012b8877 -s ours am: 41b7b6fa89 -s ours 
am skip reason: Merged-In Ia5208702fc02d0e1ab53d1affc664363fba74a67 with SHA-1 6f69b70747 is already in history

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

Change-Id: Id4554bfcea83f3cc30b173785280122503c9d1f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 21:08:24 +00:00
Xin Li
9385c80506 [automerger skipped] Merge UP1A.230905.019 am: 3a846b926f -s ours am: b37805d761 -s ours am: a184d57a22 -s ours 
am skip reason: Merged-In Ia5208702fc02d0e1ab53d1affc664363fba74a67 with SHA-1 6f69b70747 is already in history

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

Change-Id: Ib5f7021e15d43088dfa64650b2dd9bbab74ef8e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 21:07:21 +00:00
Xin Li
41b7b6fa89 [automerger skipped] Merge "Merge UP1A.230905.019" into aosp-main-future am: 236f2cd5e3 -s ours am: 6b012b8877 -s ours 
am skip reason: Merged-In Ia5208702fc02d0e1ab53d1affc664363fba74a67 with SHA-1 6f69b70747 is already in history

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

Change-Id: I615b78212d0ef249e738d6dba47eaa64acb60f5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 20:35:28 +00:00
Xin Li
a184d57a22 [automerger skipped] Merge UP1A.230905.019 am: 3a846b926f -s ours am: b37805d761 -s ours 
am skip reason: Merged-In Ia5208702fc02d0e1ab53d1affc664363fba74a67 with SHA-1 6f69b70747 is already in history

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

Change-Id: I208e96d080372b9a781e8f402e7a575292f960f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 20:34:29 +00:00
Treehugger Robot
d2b58c16a4 Merge changes from topic "aconfig-misc-fixes-2023-09-04" into main am: 6c4627369e am: 6a5b171816 am: 73039bc572 am: 70ead8ce26 
Original change: https://android-review.googlesource.com/c/platform/build/+/2738374

Change-Id: I0a6afea90a59f4dc4999de7d47540b4735d16acc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 20:18:16 +00:00
Treehugger Robot
15a0ac9a6a Merge "Reland: Add 16k/4k boot OTAs to /system partition" into main am: 4d779cf4cd am: 61291bb9a7 am: b4a808523d am: f39afc4ea9 
Original change: https://android-review.googlesource.com/c/platform/build/+/2737042

Change-Id: Ie40bcaaeb3824290ed4b029555207ae53b955e8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 20:17:18 +00:00
Xin Li
6b012b8877 [automerger skipped] Merge "Merge UP1A.230905.019" into aosp-main-future am: 236f2cd5e3 -s ours 
am skip reason: Merged-In Ia5208702fc02d0e1ab53d1affc664363fba74a67 with SHA-1 6f69b70747 is already in history

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

Change-Id: Ie546e1d771ac609bf140d2dcb0647971e9bfcf76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 19:46:06 +00:00
Xin Li
b37805d761 [automerger skipped] Merge UP1A.230905.019 am: 3a846b926f -s ours 
am skip reason: Merged-In Ia5208702fc02d0e1ab53d1affc664363fba74a67 with SHA-1 6f69b70747 is already in history

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

Change-Id: I7c01dbcac1f3b0711bc633f87659bd2495d4025f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 19:45:12 +00:00
Treehugger Robot
70ead8ce26 Merge changes from topic "aconfig-misc-fixes-2023-09-04" into main am: 6c4627369e am: 6a5b171816 am: 73039bc572 
Original change: https://android-review.googlesource.com/c/platform/build/+/2738374

Change-Id: I8669bdd4e4a7857b3bec3399dccf29ef274c8e6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 19:44:07 +00:00
Treehugger Robot
f39afc4ea9 Merge "Reland: Add 16k/4k boot OTAs to /system partition" into main am: 4d779cf4cd am: 61291bb9a7 am: b4a808523d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2737042

Change-Id: I282f8764b829a0f7895246b0befa348ee2e738e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 19:43:16 +00:00
Treehugger Robot
73039bc572 Merge changes from topic "aconfig-misc-fixes-2023-09-04" into main am: 6c4627369e am: 6a5b171816 
Original change: https://android-review.googlesource.com/c/platform/build/+/2738374

Change-Id: Ib1193197fb885eace7b6939837d03bdc4a6ae50b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 19:20:45 +00:00
Treehugger Robot
b4a808523d Merge "Reland: Add 16k/4k boot OTAs to /system partition" into main am: 4d779cf4cd am: 61291bb9a7 
Original change: https://android-review.googlesource.com/c/platform/build/+/2737042

Change-Id: Ie67f3eed1c5b04194c9ea1ee30bb43ee89d220f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 19:20:27 +00:00
Jared Duke
d2ac33c300 Merge "Ensure special Dalvik annotations are kept" into main am: 2674152fdc am: 2e2c2ab1b8 am: ae9d49b5ad am: 69f1315c08 
Original change: https://android-review.googlesource.com/c/platform/build/+/2737913

Change-Id: Ic9f195bf20ac89c165979aac2732f7cc5af28ce7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 18:59:19 +00:00
Xin Li
236f2cd5e3 Merge "Merge UP1A.230905.019" into aosp-main-future 2023-09-05 18:36:11 +00:00
Jared Duke
69f1315c08 Merge "Ensure special Dalvik annotations are kept" into main am: 2674152fdc am: 2e2c2ab1b8 am: ae9d49b5ad 
Original change: https://android-review.googlesource.com/c/platform/build/+/2737913

Change-Id: I3ad4dc7049e5d9b287054963194514ff9973f127
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 18:14:33 +00:00
Treehugger Robot
6a5b171816 Merge changes from topic "aconfig-misc-fixes-2023-09-04" into main am: 6c4627369e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2738374

Change-Id: Id1108f202bdd118455ea80f2d72f5a3ab26b1bf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 18:12:48 +00:00
Treehugger Robot
61291bb9a7 Merge "Reland: Add 16k/4k boot OTAs to /system partition" into main am: 4d779cf4cd 
Original change: https://android-review.googlesource.com/c/platform/build/+/2737042

Change-Id: If10df8b82643b13ebae55415b3281b20e92f59d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 18:12:08 +00:00
Treehugger Robot
6c4627369e Merge changes from topic "aconfig-misc-fixes-2023-09-04" into main 
* changes:
  aconfig: add invariant checks for `is_fixed_read_only`
  aconfig: re-enable development with cargo
 2023-09-05 17:21:22 +00:00
Jared Duke
ae9d49b5ad Merge "Ensure special Dalvik annotations are kept" into main am: 2674152fdc am: 2e2c2ab1b8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2737913

Change-Id: I1db8277132485f3457c9a753f89f929437956bba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 17:00:49 +00:00
Treehugger Robot
4d779cf4cd Merge "Reland: Add 16k/4k boot OTAs to /system partition" into main 2023-09-05 16:55:20 +00:00
Jared Duke
2e2c2ab1b8 Merge "Ensure special Dalvik annotations are kept" into main am: 2674152fdc 
Original change: https://android-review.googlesource.com/c/platform/build/+/2737913

Change-Id: I17e8b34094ac694729a58ef4f29333df1cc71cce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 16:10:48 +00:00
Jared Duke
2674152fdc Merge "Ensure special Dalvik annotations are kept" into main 2023-09-05 15:49:17 +00:00
Mårten Kongstad
21717e744e aconfig: add invariant checks for is_fixed_read_only 
Update parsed_flag::verify_fields to verify that the invariant "if a
parsed flag is_fixed_read_only, its permission must be READ_ONLY".

Note: commands.rs will ensure that no value files are used to create an
invalid parsed flag when flag declarations and values are parsed, but
the invariant check should still be added for completeness sake, and to
make sure no invalid hand-crafted test data exists.

Also fix invalid test data found by adding this invariant.

Bug: 298935897
Test: atest aconfig.test
Change-Id: I8cea5c4d28c458525b7034d78ecb34dd09272771
 2023-09-04 20:25:59 +02:00
Kiyoung Kim
00add245be Merge "Do not set ro.(product.)vndk.version if VNDK is deprecated" into main am: a28e56e1cc am: e68edc80c1 am: 000b71f387 am: b5ad8b1e3f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2727594

Change-Id: I09335581d242b1e8dc1be9db298f564a34e15775
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-04 11:24:28 +00:00
Mårten Kongstad
5cfad6abd2 aconfig: re-enable development with cargo 
The integration tests introduced in 906405f5c9 depend on libraries
auto-generated by running aconfig. This works fine for the Android build
system, but breaks `cargo t`.

Disable the tests when using `cargo t` for local development. Cargo can
be used for rapid local development, including running unit tests;
integration tests should be run using atest.

Bug: 298904077
Test: cargo t
Test: atest aconfig.test_mode.test.rust aconfig.prod_mode.test.rust
Change-Id: Ifcd374fa6efdc121cbfd4c4ac4fb43cf9cacc192
 2023-09-04 13:22:28 +02:00
Kiyoung Kim
b5ad8b1e3f Merge "Do not set ro.(product.)vndk.version if VNDK is deprecated" into main am: a28e56e1cc am: e68edc80c1 am: 000b71f387 
Original change: https://android-review.googlesource.com/c/platform/build/+/2727594

Change-Id: I0b003e0a850da62ed13722c416bba25d6f6578ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-04 10:45:53 +00:00
Kiyoung Kim
000b71f387 Merge "Do not set ro.(product.)vndk.version if VNDK is deprecated" into main am: a28e56e1cc am: e68edc80c1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2727594

Change-Id: Ic95343e8b504c26bd899089ced7f63526f264f36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-04 09:55:18 +00:00
Kiyoung Kim
e68edc80c1 Merge "Do not set ro.(product.)vndk.version if VNDK is deprecated" into main am: a28e56e1cc 
Original change: https://android-review.googlesource.com/c/platform/build/+/2727594

Change-Id: I3968b8e6773bb60cb8ef064af931536177eaa019
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-04 09:00:11 +00:00
Kiyoung Kim
a28e56e1cc Merge "Do not set ro.(product.)vndk.version if VNDK is deprecated" into main 2023-09-04 08:09:56 +00:00
Treehugger Robot
06da7cbec1 Merge "Add vndk list change history file" into udc-dev-plus-aosp am: 436a85aff7 am: cef69de0fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24623435

Change-Id: I05ba68038ad19a0f01be3516f986b1551ab1eeb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-04 02:00:47 +00:00
Treehugger Robot
cef69de0fd Merge "Add vndk list change history file" into udc-dev-plus-aosp am: 436a85aff7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24623435

Change-Id: I49b35f28e78c8bdfe5d2253af6ec32a414e2e36a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-04 01:23:23 +00:00
Treehugger Robot
436a85aff7 Merge "Add vndk list change history file" into udc-dev-plus-aosp 2023-09-04 00:44:29 +00:00
Treehugger Robot
b09a85e7c8 Merge "Add the adevice host tool to standard builds" into main am: 5da26c0ab3 am: d56c052f72 am: df13dc9be8 am: e9e781fea1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2736132

Change-Id: I0d6638a59b276b18edc3aa3da7f487a8f01d8e05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-02 02:23:14 +00:00
Treehugger Robot
e9e781fea1 Merge "Add the adevice host tool to standard builds" into main am: 5da26c0ab3 am: d56c052f72 am: df13dc9be8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2736132

Change-Id: Ia306c1fcdacfb83f06cfb83f4980982a6fd3b74a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-02 01:45:17 +00:00
Treehugger Robot
df13dc9be8 Merge "Add the adevice host tool to standard builds" into main am: 5da26c0ab3 am: d56c052f72 
Original change: https://android-review.googlesource.com/c/platform/build/+/2736132

Change-Id: Id2c4cd9e5d06daae60a4988403deeede6002badc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-02 00:54:42 +00:00
Treehugger Robot
d56c052f72 Merge "Add the adevice host tool to standard builds" into main am: 5da26c0ab3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2736132

Change-Id: Ib34308cf87d0c2c26055379ab117668fc6bf4f3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-02 00:01:04 +00:00
Treehugger Robot
5da26c0ab3 Merge "Add the adevice host tool to standard builds" into main 2023-09-01 23:13:14 +00:00
Treehugger Robot
c4d4033d2e Merge "Don't read the odex zip files when building sbom-metadata.csv" into main am: db21a2aee5 am: 5f0bd8a83f am: 037ed034a4 am: 1ba7c6c442 
Original change: https://android-review.googlesource.com/c/platform/build/+/2731043

Change-Id: I7ed24ca6b7306e8a7ed28c2ca7b6153b2aa0e80e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 22:10:11 +00:00
Nikita Ioffe
a882c21d19 Merge "Propagate RELEASE_AVF_ENABLE_MULTI_TENANT_MICRODROID_VM to soong" into main am: 68e7cb9c67 am: c8a6acbce8 am: ec81ed24b6 am: 279301b11c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2735632

Change-Id: I6b90cb1492fd8e0ce7c8fd16a2386efd62594622
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 22:09:06 +00:00
Treehugger Robot
1ba7c6c442 Merge "Don't read the odex zip files when building sbom-metadata.csv" into main am: db21a2aee5 am: 5f0bd8a83f am: 037ed034a4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2731043

Change-Id: I7d61b33b091e32f9a13766cac5174ad046f87521
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 21:32:59 +00:00
Nikita Ioffe
279301b11c Merge "Propagate RELEASE_AVF_ENABLE_MULTI_TENANT_MICRODROID_VM to soong" into main am: 68e7cb9c67 am: c8a6acbce8 am: ec81ed24b6 
Original change: https://android-review.googlesource.com/c/platform/build/+/2735632

Change-Id: Icd9503c2968dcdfe255195deb02c2acb219ac22e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 21:32:11 +00:00
Jared Duke
cb3505c1be Ensure special Dalvik annotations are kept 
These optimization annotations are special in that we don't want them
to have RUNTIME retention, but we do want them to be visible to ART.
R8 already has special rules to handle them, but with R8 full mode
it still requires a minimal keep rule for the given reference.

This allows usage of annotations like @NeverCompile from fully optimized
platform targets like SystemUI.

Bug: 215417388
Test: m + compare SystemUIGoogle.odex w/ @NeverCompile annotations
Change-Id: Id14bcc7b6d0d6dd385c60cfbe4d31f295cbaa5dc
 2023-09-01 21:27:30 +00:00
Treehugger Robot
037ed034a4 Merge "Don't read the odex zip files when building sbom-metadata.csv" into main am: db21a2aee5 am: 5f0bd8a83f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2731043

Change-Id: I6bc74e5b4ca003e1ac38e671fb75a9be9099ed0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 20:42:48 +00:00
Nikita Ioffe
ec81ed24b6 Merge "Propagate RELEASE_AVF_ENABLE_MULTI_TENANT_MICRODROID_VM to soong" into main am: 68e7cb9c67 am: c8a6acbce8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2735632

Change-Id: Iaa520a9ded1feb8ba47298c6314d6fb80b385545
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 20:42:02 +00:00
Kelvin Zhang
a3221ca41f Merge "Use seek() instead of writing 0s" into main am: dfa0c85705 am: 62d130b2c2 am: 72f1086066 am: ec14133956 
Original change: https://android-review.googlesource.com/c/platform/build/+/2734171

Change-Id: Ie789019b32ceb7b5b2af471e37834f962a477992
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 20:28:56 +00:00
Treehugger Robot
038e750c51 Merge "Mark boot OTAs as partial OTAs" into main am: 145ca3034f am: 892071ae93 am: 805e4263ed am: b196092c34 
Original change: https://android-review.googlesource.com/c/platform/build/+/2733819

Change-Id: Ib534f805d03863765b652f0087b816267f445a47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 20:28:36 +00:00
Joe Onorato
08d6ebf118 Add the adevice host tool to standard builds 
Test: treehugger
Change-Id: Ib8caceecbcc355f6aa8725a2f134f2d1ac86d387
 2023-09-01 13:24:51 -07:00
Kelvin Zhang
ec14133956 Merge "Use seek() instead of writing 0s" into main am: dfa0c85705 am: 62d130b2c2 am: 72f1086066 
Original change: https://android-review.googlesource.com/c/platform/build/+/2734171

Change-Id: Ie9108ed5dbdcb3cfc07d2b49e74e416282fda3a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 19:52:16 +00:00
Treehugger Robot
b196092c34 Merge "Mark boot OTAs as partial OTAs" into main am: 145ca3034f am: 892071ae93 am: 805e4263ed 
Original change: https://android-review.googlesource.com/c/platform/build/+/2733819

Change-Id: Ie693bd7bd3a145b763853c1daa408b526abacd07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 19:50:54 +00:00
Treehugger Robot
5f0bd8a83f Merge "Don't read the odex zip files when building sbom-metadata.csv" into main am: db21a2aee5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2731043

Change-Id: I3540341c1534781b8e224c11370bade90768055f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-01 19:48:20 +00:00