Commit graph

3009 commits

Author SHA1 Message Date
Nelson Li
c89be9a29c Change TARGET_RECOVERY_UI_LIB to use fully qualified names in zuma am: 2620d19ec0
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3391984

Change-Id: Ibf09f5a3214be084579feed71414fff0e6fb0f5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-06 01:35:49 +00:00
Nelson Li
2620d19ec0 Change TARGET_RECOVERY_UI_LIB to use fully qualified names in zuma
Since the TARGET_RECOVERY_UI_LIB for each device is not exactly the
same, and most of the modules in it contain `soong_namespace{}` to
avoid conflicts between different devices, after converting
`librecovery_ui_ext` from Android.mk to Android.bp, it needs to be
changed to a `fully qualified name` in order to correctly use the
corresponding module.

Flag: EXEMPT refactor

Bug: 339143524
Test: m -j librecovery_ui_ext
Merged-In: I2912cbc905ff0ee716c293021c29061e3b6d3dca
Change-Id: I2912cbc905ff0ee716c293021c29061e3b6d3dca
2024-12-05 03:33:40 +00:00
Xin Li
e589918368 Merge ab/AP4A.241205.013 into aosp-main-future
Bug: 370570306
Merged-In: I38afa16f8f85e6aea31ddd5367c2e2d4a3249ced
Change-Id: Ie5037f28c6b829fc7915f48fb9e787865a0e9a11
2024-11-27 12:53:10 -08:00
Xin Li
d3c951fe56 Merge 24Q4 (ab/12406339) into aosp-main-future
Bug: 370570306
Merged-In: I3977722564241817575d94b2d2023eac6939ce1c
Change-Id: Ifdc2acba1138fd79b5f26ffc07e7024149440872
2024-11-06 11:05:05 -08:00
Bill Yang
eb26e6bf3b Set BOARD_LIBACRYL_G2D_HDR_PLUGIN for soong am: 32b6825bf1
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3288011

Change-Id: Idb52ede4f32cffeecd805f3c8690779e74bdf96c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-29 02:50:15 +00:00
Bill Yang
32b6825bf1 Set BOARD_LIBACRYL_G2D_HDR_PLUGIN for soong
Set the full module path of libacryl_hdr_plugin and the include dir for
lobacryl conversion to soong. It will take effect after aosp/3286932 and
aosp/3287183 merged.

Bug: 370414334
Test: lunch aosp_shiba-trunk_staging-userdebug ; m libacryl_hdr_plugin libacryl
Change-Id: I253ce1254450385e83ecaa75acbee5e70df3a930
2024-10-25 03:37:18 +00:00
Robin Peng
edd87c421e 16k: Ignore 16k kernel settings if 16kb folder doesn't exist am: 9e1bb10e89
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3313596

Change-Id: Ib075b276396597229c654a1c55bd5bcfa7d2d3d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-22 03:44:29 +00:00
Vilas Bhat
399ba7d977 16k: Move logic from device/google/shusky/BoardConfig-shusky-common.mk to zuma/BoardConfig-16k-common.mk am: fbedb6f26f
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3313595

Change-Id: I9b1ea72ed2253ed68608e2a64b98a5705fd7df4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-22 03:44:26 +00:00
Juan Yescas
bf8283c053 16kb: Use TARGET_BOOTS_16K to select the efs config files am: e192e6f56e
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3312654

Change-Id: I476a3217cc8f10d3786eb21fa45c3b3aa8dc80ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-22 03:44:23 +00:00
Juan Yescas
c03be2441d 16kb: Use PRODUCT_BOOTS_16K to select the proper rc file and fstab am: 0420e6dfff
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3312653

Change-Id: I9f5abbdd5f6432e0430d300fe120526e99b6200b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-10-22 03:44:15 +00:00
Robin Peng
9e1bb10e89 16k: Ignore 16k kernel settings if 16kb folder doesn't exist
to avoid build breakage with test kernel prebuilts (e.g. ag/28525733)
that doesn't have 16kb artifacts in it.

Bug: 370842132
Bug: 349877551
Flag: EXEMPT bugfix
Change-Id: I2f6c1f3365f624502366b883dbcd1066ed166cdb
Merged-In: I2f6c1f3365f624502366b883dbcd1066ed166cdb
2024-10-17 23:28:59 +00:00
Vilas Bhat
fbedb6f26f 16k: Move logic from device/google/shusky/BoardConfig-shusky-common.mk to zuma/BoardConfig-16k-common.mk
The makefile logic in device/google/shusky/BoardConfig-shusky-common.mk
is identical to the logic required for akita. Hence, this logic is
moved to device/google/zuma/BoardConfig-16k-common.mk to avoid
duplicating the file for akita.

Bug: 370842132
Bug: 349877551
Test: Built and booted up `aosp_shiba` and and `aosp_shiba-pgagnostic` targets
Flag: EXEMPT bugfix
Change-Id: Ibd060eae8f4e97ae8ff800f765e2310c984e5796
Merged-In: Ibd060eae8f4e97ae8ff800f765e2310c984e5796
2024-10-17 23:28:48 +00:00
Juan Yescas
e192e6f56e 16kb: Use TARGET_BOOTS_16K to select the efs config files
Test: Build and test pgagnostic targets
Bug: 370842132
Bug: 350529323
Bug: 346868433
Flag: EXEMPT bugfix
Change-Id: I1e0bea52de09fe3c9ee2f52b0803882456943833
Merged-In: I1e0bea52de09fe3c9ee2f52b0803882456943833
2024-10-17 23:28:34 +00:00
Juan Yescas
0420e6dfff 16kb: Use PRODUCT_BOOTS_16K to select the proper rc file and fstab
The build flag PRODUCT_BOOTS_16K will be used to select
the proper efs rc file and fstab:

- When PRODUCT_BOOTS_16K := true, 16k rc files and fstab will be used.
- When PRODUCT_BOOTS_16K := false, 4k rc files and fstab will be used.

Bug: 370842132
Bug: 346868433
Test: Built and booted up `aosp_shiba` and and `aosp_shiba-pgagnostic` targets
Flag: EXEMPT bugfix
Change-Id: I4dba20518925a176f1e1e66596e2bb1e8ade7c26
Merged-In: I4dba20518925a176f1e1e66596e2bb1e8ade7c26
2024-10-17 23:28:10 +00:00
Android Build Coastguard Worker
35b61d361a Merge cherrypicks of ['googleplex-android-review.googlesource.com/29773030'] into 24Q4-release.
Change-Id: I9d54790eb1b73b75eed71eafc51831159fd03f8e
2024-10-17 00:33:05 +00:00
Rick Yiu
1a173d6997 Set auto prefer idle task name
Set InputDispatche and InputReader prefer idle explicitly, which is a
workaround and should be removed after they become ADPF.

Bug: 366146314
Flag: NONE init rc file change does not support flags
Test: tasks set as expected
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a6c71987d597d0d575b62f6a65807c1bcd08ee87)
Merged-In: I38afa16f8f85e6aea31ddd5367c2e2d4a3249ced
Change-Id: I38afa16f8f85e6aea31ddd5367c2e2d4a3249ced
2024-10-17 00:28:18 +00:00
Shikha Panwar
bb3fb6aa85 Zuma: Enable Secretkeeper on aosp targets am: 72946bd429
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3287155

Change-Id: I7e161f139f098fb1f2d15569eb93484139cd67a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-30 15:42:59 +00:00
Shikha Panwar
72946bd429 Zuma: Enable Secretkeeper on aosp targets
These are used for testing, enable Secretkeeper on these devices.

Test: get_build_var SECRETKEEPER_ENABLED
Bug: 341708664
Change-Id: I0fd0e3d5a16cab352c79228e89f9d2fdd6f886b7
2024-09-30 12:13:56 +00:00
Android Build Coastguard Worker
d991c351d8 Snap for 12397640 from 57a8d79710 to 24Q4-release
Change-Id: If5342a2d21e125e1093d48c2dc316b6d74847b43
2024-09-21 01:03:12 +00:00
Krzysztof Kosiński
57a8d79710 Delete TARGET_CPU_VARIANT_RUNTIME. am: 48f1c2182c am: 7cd5c7d047
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3274367

Change-Id: I8c5b866a0114073ce6a4252cd265dce8f3b1cb82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-20 20:48:38 +00:00
Krzysztof Kosiński
7cd5c7d047 Delete TARGET_CPU_VARIANT_RUNTIME. am: 48f1c2182c
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3274367

Change-Id: Ieb3853b09bfbc56d955a88fc4c78b3fb0ff5f3e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-20 20:33:17 +00:00
Krzysztof Kosiński
48f1c2182c Delete TARGET_CPU_VARIANT_RUNTIME.
This variable only does something when it differs from
TARGET_CPU_VARIANT. Setting it to the same values doesn't do
anything.

Bug: 368635026
Test: presubmit
Change-Id: I1e16c5b9244eca4d69909bb1caefebfc17e54a70
2024-09-20 19:19:37 +00:00
Android Build Coastguard Worker
fbcec90b66 Snap for 12391343 from f42925e978 to 24Q4-release
Change-Id: Ic28357cfffa3286f1c41a1c41bffbe998d8dd700
2024-09-19 23:03:07 +00:00
Jerry Chang
f42925e978 Add input event profile to mitigate input latency of input threads
Bug: 347122505
Test: check the priority and latency of input thread in Perffeto
Flag: NONE early device setting updates
Change-Id: I3977722564241817575d94b2d2023eac6939ce1c
2024-09-18 12:06:53 +00:00
Android Build Coastguard Worker
5f235a3cd4 Snap for 12373988 from 6afb3f9858 to 24Q4-release
Change-Id: Ie5996b138804ca32b105b38ac65c0b829b0a9fa2
2024-09-16 23:03:05 +00:00
Ryan Prichard
6afb3f9858 zuma: avoid vector<const T> am: 4ed3c2fb25 am: 6556da1b96
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3264354

Change-Id: Ia70eb3e1e0be69674ecf56f8f846570d3b65b5f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-16 20:13:39 +00:00
Ryan Prichard
6556da1b96 zuma: avoid vector<const T> am: 4ed3c2fb25
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3264354

Change-Id: Ie2eba8ae7c5010573e70e780e1c957f046e7d6ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-16 19:53:10 +00:00
Android Build Coastguard Worker
7db473226c Snap for 12368321 from c46756b74a to 24Q4-release
Change-Id: I9178d97eb1d5011f76a12170a02fb0a040edbb7e
2024-09-14 01:03:13 +00:00
Ryan Prichard
4ed3c2fb25 zuma: avoid vector<const T>
std::vector<const T> uses std::allocator<const T>, which is an
undocumented libc++ extension to the C++ standard library. The extension
was removed in llvm.org/PR96319. Use an ordinary non-const T instead.

Bug: http://b/349681543
Test: m android.hardware.power.stats-impl.zuma
Flag: EXEMPT, refactor to fix build failure
Change-Id: I47d0b3a441ab4ec8dd2ad8e794ae84f184d0d40f
2024-09-13 09:25:49 -07:00
Android Build Coastguard Worker
a256642e8c Snap for 12361654 from 7b5da7c4d5 to 24Q4-release
Change-Id: If037a0c12c150e370a9575be4c7e6564a7636fad
2024-09-12 23:02:53 +00:00
Pawan Wagh
c46756b74a 16kb: Filter out zram.ko for dev options
Test: atest Enable16KbTest
Flag: EXEMPT bugfix
Bug: 363412208
Change-Id: Ib1e135889186eeccb21448e16660701967c92c5c
2024-09-12 20:23:14 +00:00
Android Build Coastguard Worker
d8426dbe90 Snap for 12354992 from f18a5cb789 to 24Q4-release
Change-Id: I70d3fe05a103c443d82ce4ccc6ab7c14fc5ae8c4
2024-09-11 23:02:54 +00:00
Kelvin Zhang
7b5da7c4d5 Merge "Support 16KB data reset" into main 2024-09-11 22:31:02 +00:00
Chia-Chi Teng
f18a5cb789 Merge "Deprecate preloaded_nanoapps.json" into main 2024-09-11 18:41:22 +00:00
Android Build Coastguard Worker
d7fbb34f66 Snap for 12348750 from 54f83f2d07 to 24Q4-release
Change-Id: I798f4a0fd86b38da7ae433f968f157931ec13cf9
2024-09-10 23:03:50 +00:00
Kelvin Zhang
2dbe6e6fd2 Support 16KB data reset
We didn't add the formattable flag to ext4 fstab entry because init
only uses the first entry for re-formatting, but now init can choose
the right fs type base on page size, we can add the formattable flag.
Now data resets in 16KB mode would go back to ext4.

Test: th
Bug: 356202847
Change-Id: Ieb01c2592b3bb8e3342b2b6178ee73c0fb8a4288
2024-09-10 21:01:30 +00:00
David Li
54f83f2d07 Merge "audio: set util_clamp_min for s/w spatializer to avoid glitches" into main 2024-09-10 07:14:08 +00:00
Chia-Chi Teng
f52ee80ff6 Deprecate preloaded_nanoapps.json
Flag: EXEMPT resource only update
Bug: 350102369
Test: on device and presubmit
Change-Id: I5b5c3fe3a37199f3a55cb6e0e31f0ce141bc0dda
2024-09-10 01:56:29 +00:00
Android Build Coastguard Worker
5e300be87f Snap for 12342105 from e32a7f759b to 24Q4-release
Change-Id: I9665ed25d464aaf90f0e137618c3a2aaef5cbef7
2024-09-09 23:03:34 +00:00
Pawan Wagh
847ea2b1b0 Merge "Revert "Disable incremental boot_otas"" into main 2024-09-09 22:47:41 +00:00
Pawan Wagh
dd3eec8677 Revert "Disable incremental boot_otas"
This reverts commit 8bb0da99a9.

Reason for revert: Incremental ota support is now available: b/339658378
Fixes disk size regression issue now that OTA signing issues are resolved.

Change-Id: Id897a60473e6ea99522d9ab372511e7c2ebdd757
2024-09-09 21:37:42 +00:00
Steven Moreland
175979b0ca Add persist to CopyEfsTest
Change-Id: I8e12b0ac5e529e15697f35b88ac8b43c798fedd1
Test: atest CopyEfsTest
Flag: TEST_ONLY
Bug: 352567354
2024-09-09 20:50:56 +00:00
Daniel Rosenberg
069a8098b3 Fix CopyEfsTest for symlinks
Use the -L flag to preserve symlinks.
Fixed various flags to ensure we handle symlinks right,
and adjusted the awk string to handle difference in how dates are
represented.

Test: atest CopyEfsTest
Flag: TEST_ONLY
Bug: 352567354
Change-Id: I686c16fc1d771bf00bdc7465beb29a91eaef9e46
2024-09-09 20:50:40 +00:00
Treehugger Robot
e32a7f759b [automerger skipped] Merge "Delete PRODUCT_FULL_TREBLE_OVERRIDE." into main am: 8c1ec1b9e0 am: 3e64c07a4b -s ours
am skip reason: Merged-In I181937f9e49d4b9e1088fc92df7681d1a39e3d26 with SHA-1 c8436d8183 is already in history

Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3254799

Change-Id: I90a90a60fa55277d8b8f5061f33e8cbc7d015d4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-09 19:09:43 +00:00
Treehugger Robot
3e64c07a4b Merge "Delete PRODUCT_FULL_TREBLE_OVERRIDE." into main am: 8c1ec1b9e0
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3254799

Change-Id: If245fe61ad9ab7012b25681d1d37fc6cbb4219f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-09 19:01:27 +00:00
Treehugger Robot
8c1ec1b9e0 Merge "Delete PRODUCT_FULL_TREBLE_OVERRIDE." into main 2024-09-09 18:55:05 +00:00
Treehugger Robot
ffa9cd13fe Merge "Delete PRODUCT_FULL_TREBLE_OVERRIDE." into main 2024-09-09 17:51:17 +00:00
Krzysztof Kosiński
54ceb87f8e Delete PRODUCT_FULL_TREBLE_OVERRIDE.
This variable doesn't do anything for devices launching with
API level 26 or later, and the initial zuma devices (Pixel 8)
launched with API level 34.

Bug: 307369186
Test: presubmit
Flag: EXEMPT trivial build cleanup
Change-Id: I181937f9e49d4b9e1088fc92df7681d1a39e3d26
Merged-In: I181937f9e49d4b9e1088fc92df7681d1a39e3d26
2024-09-09 17:05:00 +00:00
Krzysztof Kosiński
c8436d8183 Delete PRODUCT_FULL_TREBLE_OVERRIDE.
This variable doesn't do anything for devices launching with
API level 26 or later, and the initial zuma devices (Pixel 8)
launched with API level 34.

Bug: 307369186
Test: presubmit
Flag: EXEMPT trivial build cleanup
Change-Id: I181937f9e49d4b9e1088fc92df7681d1a39e3d26
2024-09-09 17:03:22 +00:00
Android Build Coastguard Worker
eb71245c16 Snap for 12337246 from 8fd1accc1e to 24Q4-release
Change-Id: I419ba6690d110cbf3c1112c80c2b8607fbad645b
2024-09-07 21:03:01 +00:00