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
Zhi Dou
f6287509ed Merge "aconfig: generate full fakefeatureflagsimpl in prod mode" into main am: 401be560de am: f1b494624c am: 017ad46fa9 
Original change: https://android-review.googlesource.com/c/platform/build/+/2709686

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

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

Change-Id: I93519fc9229e061278ffbbc18d0458dbaabad808
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 14:23:36 +00:00
Zhi Dou
401be560de Merge "aconfig: generate full fakefeatureflagsimpl in prod mode" into main 2023-08-29 13:29:31 +00:00
Cole Faust
48f079b167 Merge "Add dexpreopt files to ALL_MODULES.$(m).INSTALLED" into main am: 303d7da643 am: 377f554483 am: 44780b4d82 am: 951fba8681 
Original change: https://android-review.googlesource.com/c/platform/build/+/2729625

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

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

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

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

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

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

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

Change-Id: I8506d2b4b92eb1c2f123d8bb4499539cb4cb45de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 04:19:48 +00:00
Treehugger Robot
87283d346d Merge "Use board api level for seapp coredomain check" into main am: c8c6cbbb27 am: d6e3f50ed0 am: 54dead2799 am: 63ebf56ee1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2727597

Change-Id: I357a8878ec6c926ff9d7ff7018bd80099a168a76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 04:07:27 +00:00
Treehugger Robot
89f0428c87 Merge "Update vndk list 34.txt" into udc-dev-plus-aosp 2023-08-29 03:51:50 +00:00
Treehugger Robot
63ebf56ee1 Merge "Use board api level for seapp coredomain check" into main am: c8c6cbbb27 am: d6e3f50ed0 am: 54dead2799 
Original change: https://android-review.googlesource.com/c/platform/build/+/2727597

Change-Id: Ib086f8f9b19c54ccd4d2a382c62ac0a4abb8a103
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 03:31:55 +00:00
Cole Faust
377f554483 Merge "Add dexpreopt files to ALL_MODULES.$(m).INSTALLED" into main am: 303d7da643 
Original change: https://android-review.googlesource.com/c/platform/build/+/2729625

Change-Id: I60ad04622bfd6fde210957916634b749f1f914c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 03:29:49 +00:00
Treehugger Robot
6ca8e44d67 Merge "ota_from_target_files requires apexd_host" into main am: 4b00773378 
Original change: https://android-review.googlesource.com/c/platform/build/+/2730213

Change-Id: I256a556121da78c37923510786e34a5bef5049c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 03:28:47 +00:00
Cole Faust
303d7da643 Merge "Add dexpreopt files to ALL_MODULES.$(m).INSTALLED" into main 2023-08-29 02:46:09 +00:00
Treehugger Robot
54dead2799 Merge "Use board api level for seapp coredomain check" into main am: c8c6cbbb27 am: d6e3f50ed0 
Original change: https://android-review.googlesource.com/c/platform/build/+/2727597

Change-Id: I20466508fb686e4819e7dd04a2460aa919e75b18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 02:45:45 +00:00
Treehugger Robot
4b00773378 Merge "ota_from_target_files requires apexd_host" into main 2023-08-29 02:24:11 +00:00
Treehugger Robot
d6e3f50ed0 Merge "Use board api level for seapp coredomain check" into main am: c8c6cbbb27 
Original change: https://android-review.googlesource.com/c/platform/build/+/2727597

Change-Id: Ib240dec2e031f1e5f6ba650c7a9dada63282fad4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 01:56:09 +00:00
Justin Yun
dc6e1496fc Update vndk list 34.txt 
Bug: 297542516
Test: lunch cf_x86_64_phone-next-userdebug && m
Change-Id: I7984e0f1d311ed4a9f908f0232f2bc1994a90157
 2023-08-29 10:54:00 +09:00
Jooyung Han
ccec6ad2ec ota_from_target_files requires apexd_host 
apexd_host is invoked in check_target_files_vintf.py
to prepare the apex directory before invoking checkvintf. ota_from_target_files uses check_target_files_vintf.py via (python_library) releasetools_check_target_files_vintf.

Since soong doesn't inherit "required:" property from library to binary, adding the dependency manually to ota_from_target_files.

Bug: n/a
Test: $ m ota_from_target_files # should build apexd_host
Change-Id: Ie7e6c3acf376c23960f242294f5a9bf99fec26aa
 2023-08-29 01:28:40 +00:00
Xin Li
23999bb670 [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 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: I70df2091421169d2608c51be3e2b05cad340fc7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 01:15:32 +00:00
Cole Faust
a220e4596f Add dexpreopt files to ALL_MODULES.$(m).INSTALLED 
We're trying to make FULL_SYSTEMIMAGE_DEPS more accurate to remove the
need for `m installclean`. The dexpreopt files did not show up in
FULL_SYSTEMIMAGE_DEPS, because they were installed with a custom
post-install command.

The dexpreopt implementation is shared between soong/make, which means
a lot of it happens at execution time for make. However, we have enough
information to guess what files to install will be inside the zip file.

Add an execution-time check that our guess is correct, and then add
the guessed files to `ALL_MODULES.$(m).INSTALLED`.

This also allows us to remove the post-install command, and just
generate rules to install the files we want directly.

Bug: 205632228
Test: full build on an internal product that uses dex-preopted make modules
Change-Id: I57db58e4587e3e198ec650c6fb39a908e4ec6993
 2023-08-28 18:12:30 -07:00
Xin Li
f7c145610c [automerger skipped] Merge Android U (ab/10368041) am: be1435290d -s ours am: 9f54ee44ba -s ours am: 16be255ad8 -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: I9285af8086e6197c5ac68aba7913a8e8845c660e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 01:10:47 +00:00
Treehugger Robot
c8c6cbbb27 Merge "Use board api level for seapp coredomain check" into main 2023-08-29 01:09:37 +00:00
Xin Li
186be73acc [automerger skipped] Merge "Merge Android U (ab/10368041)" into aosp-main-future am: c76319f88c -s ours am: c3d8d0e9cd -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: Iaac33f5bbe6a546558d69a206232a55fd79b8324
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 00:39:53 +00:00
Xin Li
16be255ad8 [automerger skipped] Merge Android U (ab/10368041) am: be1435290d -s ours am: 9f54ee44ba -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: Ic1381a462b394f96abdc9d0ea5a1a68b7058256d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 00:35:03 +00:00
Xin Li
c3d8d0e9cd [automerger skipped] Merge "Merge Android U (ab/10368041)" into aosp-main-future am: c76319f88c -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: I3549ac3e7b8eeb99390ebd2134e71272f6903ea9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-29 00:03:53 +00:00
Xin Li
9f54ee44ba [automerger skipped] Merge Android U (ab/10368041) am: be1435290d -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: Ie439641ce29f6090ef4b2c61627d3f3cc23af29b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 23:59:03 +00:00
Xin Li
c76319f88c Merge "Merge Android U (ab/10368041)" into aosp-main-future 2023-08-28 22:13:35 +00:00
Zhi Dou
06a448fac7 aconfig: generate full fakefeatureflagsimpl in prod mode 
This change will generate full fakefeatureflagsimpl in prod mode.
FakeFeatureFlagsImp will be the same in test mode and the prod mode.
FeatureFlagsImpl will be all unimplemented in test mode. setFlag,
resetAll are added into the interface FeatureFlags.

The reason to make this change is for project using injection pattern,
the project doesn't have to use test mode to test the flag guarded code.
The project can directly use the FakeFeatureFlagsImpl for testing.

Bug: 294838180
Test: atest AconfigJavaHostTest --host AND atest aconfig.test.java
Change-Id: Ib6d40fd3a9ef872e01594fd4f8d6c4cb10bb173a
 2023-08-28 16:54:15 +00:00
Inseob Kim
3c7b91bac1 Use board api level for seapp coredomain check 
Rather than PRODUCT_SHIPPING_API_LEVEL, use board api level
(BOARD_API_LEVEL or BOARD_SHIPPING_API_LEVEL) to determine whether we
check coredomain violations or not.

Also provides a Makefile variable to override the flag, for targets that
want to turn on the check optionally.

Bug: 280547417
Test: see build command of vendor_seapp_contexts
Change-Id: I177630d33313334ca4a56a9be88b78cff678281e
 2023-08-28 07:33:12 +00:00
Jooyung Han
fae9accba0 Merge "Remove TARGET_FLATTEN_APEX" into main am: 5d7f9cb2a1 am: db3c1b173f am: ea6b3e5018 am: f23413e208 am: bf2fb0676e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2727593

Change-Id: I4ef7511d2a0a88d5b6a7e7451747f839ceda3efa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 03:55:03 +00:00
Jooyung Han
bf2fb0676e Merge "Remove TARGET_FLATTEN_APEX" into main am: 5d7f9cb2a1 am: db3c1b173f am: ea6b3e5018 am: f23413e208 
Original change: https://android-review.googlesource.com/c/platform/build/+/2727593

Change-Id: I23d643b8197c34172b84cdc646d5c2bf7510c397
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 03:02:40 +00:00
Jooyung Han
f23413e208 Merge "Remove TARGET_FLATTEN_APEX" into main am: 5d7f9cb2a1 am: db3c1b173f am: ea6b3e5018 
Original change: https://android-review.googlesource.com/c/platform/build/+/2727593

Change-Id: I9b9f39280b07bb1e3f2d43ede06a66400908b4f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 02:31:51 +00:00
Jooyung Han
ea6b3e5018 Merge "Remove TARGET_FLATTEN_APEX" into main am: 5d7f9cb2a1 am: db3c1b173f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2727593

Change-Id: I12bbafad67e538b82987271f29af47c548b975f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 01:49:52 +00:00
Jooyung Han
db3c1b173f Merge "Remove TARGET_FLATTEN_APEX" into main am: 5d7f9cb2a1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2727593

Change-Id: Ide054683665fe88e04f46f607b7408f1b7ccda01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-28 01:03:27 +00:00
Jooyung Han
5d7f9cb2a1 Merge "Remove TARGET_FLATTEN_APEX" into main 2023-08-28 00:32:35 +00:00
Dan Shi
ac7a5c6df7 [automerger skipped] Revert "Adds modern wallpaper pickers to AOSP installs" am: d7e3d9d982 -s ours am: b7c12d4950 -s ours 
am skip reason: Merged-In I2658d2e5b4d4500f5a991c049f3ea9d2eb2db1a8 with SHA-1 5541d13e89 is already in history. Merged-In was found from reverted change.

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

Change-Id: I8f6bfea2839166c239eeaa5c4f912775db9d7f9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-26 06:24:27 +00:00
Dan Shi
b7c12d4950 [automerger skipped] Revert "Adds modern wallpaper pickers to AOSP installs" am: d7e3d9d982 -s ours 
am skip reason: Merged-In I2658d2e5b4d4500f5a991c049f3ea9d2eb2db1a8 with SHA-1 5541d13e89 is already in history. Merged-In was found from reverted change.

Reverted change: https://googleplex-android-review.googlesource.com/c/platform/build/+/24539247

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

Change-Id: Ib992611a6cc4788e213cf6be0f8ab8cd2fdb9b0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-26 05:38:46 +00:00
Treehugger Robot
e56dcc18e1 Merge "Reduce OTA tools's dependency on brillo_update_payload" into main am: fb4fb4b766 am: a1c288f36a am: b5d8e94838 am: f21ea38f4a am: 5a85b7c49f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2726801

Change-Id: I3319e950fb658c9f2a370794fd918e753bceeabe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-26 03:37:06 +00:00
Treehugger Robot
5a85b7c49f Merge "Reduce OTA tools's dependency on brillo_update_payload" into main am: fb4fb4b766 am: a1c288f36a am: b5d8e94838 am: f21ea38f4a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2726801

Change-Id: I97ad3a4b7c25b8e539c28ba88f32fdd52c2d901c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-26 02:41:43 +00:00
Treehugger Robot
f21ea38f4a Merge "Reduce OTA tools's dependency on brillo_update_payload" into main am: fb4fb4b766 am: a1c288f36a am: b5d8e94838 
Original change: https://android-review.googlesource.com/c/platform/build/+/2726801

Change-Id: I41b17f0c8bc4379ae72be437262b80e5db813827
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-26 02:07:20 +00:00
Treehugger Robot
b5d8e94838 Merge "Reduce OTA tools's dependency on brillo_update_payload" into main am: fb4fb4b766 am: a1c288f36a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2726801

Change-Id: I607ab24696ce04e167604acf61e939a6ce52de4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-26 01:25:14 +00:00
Treehugger Robot
a1c288f36a Merge "Reduce OTA tools's dependency on brillo_update_payload" into main am: fb4fb4b766 
Original change: https://android-review.googlesource.com/c/platform/build/+/2726801

Change-Id: I589cfce6f21ba1bcd0c7c5566f336f85719d91b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-26 00:40:44 +00:00
Treehugger Robot
fb4fb4b766 Merge "Reduce OTA tools's dependency on brillo_update_payload" into main 2023-08-26 00:22:57 +00:00
Dan Shi
d7e3d9d982 Revert "Adds modern wallpaper pickers to AOSP installs" 
This reverts commit 7d5ca2253c.

Reason for revert: b/297578174 the CL might break device boot for mixed build setup (gsi)

Change-Id: Iba7b9b13e9e45806b5975004a817ddd0a62b1306
 2023-08-26 00:17:17 +00:00
Treehugger Robot
6b43228ba3 Merge "Fix 16k ota package build failures on pixel" into main am: 8c3bb5b993 am: d3cfff21f4 am: 46293a1a4e am: 45c77b0369 am: 770c3c8f68 
Original change: https://android-review.googlesource.com/c/platform/build/+/2726994

Change-Id: I231bfb21607f023f685dcc12be293f4fdc861541
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-25 22:36:17 +00:00