Commit graph

2772 commits

Author SHA1 Message Date
Roy Luo
9601e0f266 Merge "Use absolute path for udc device" into main 2024-07-09 03:03:37 +00:00
Dmitry Skiba
4caa08f2cc Reland "Restrict kcompactd thread to middle/little cores."
This reverts commit 721a8358c6.

Reason for revert: 24Q3 has been cut, relanding the original commit ef68e9b578.

Change-Id: I7882ebafd66d126df9ccbe2124617fbf4ed73eb5
Bug: 347272991
2024-07-08 23:30:54 +00:00
Daniel Rosenberg
3f3e5d37cf Merge "Run fsck in CopyEfsTest" into main 2024-07-08 20:50:13 +00:00
Daniel Rosenberg
044dead5b6 Run fsck in CopyEfsTest
We're copying from a live r/w image, so the picture we get may be a bit
distorted. Running fsck over the image first should help with
reliability, but f2fs does some fixes on mount as well, so we mount and
unmount the image before running dump.f2fs.

Change-Id: Ibb15388c55b6f909a1d1b849f9760f248644d9e9
Signed-off-by: Daniel Rosenberg <drosen@google.com>
Bug: 349120101
Test: atest CopyEfsTest
Flag: TEST_ONLY
2024-07-08 20:49:57 +00:00
Treehugger Robot
1744a12bc4 Merge "APC/TUI: remove support for APC" into main 2024-07-08 15:34:38 +00:00
Shikha Panwar
21f55b92ea Zuma: Disable Secretkeeper HAL for aosp build am: 91d8fcccea am: 696ed20840
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3161976

Change-Id: Iba7300b26e100b1ac5e26a0d44c93e1a064e8e0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-08 13:38:54 +00:00
Shikha Panwar
696ed20840 Zuma: Disable Secretkeeper HAL for aosp build am: 91d8fcccea
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3161976

Change-Id: I335c38558c0ea53476e5d077ccb249086aff1161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-08 13:21:34 +00:00
Shikha Panwar
91d8fcccea Zuma: Disable Secretkeeper HAL for aosp build
The AOSP builds do not have a compatible BL for Secretkeeper (24Q3+).
This leads the crashing of HAL since the backing trusty is not updated
with the TA.

Test: lunch aosp & non-aosp targets -> get_build_var SECRETKEEPER_ENABLED
Bug: 350482613
Change-Id: I49d30914bc7a4b2b752a6d9eb7db0e7959638d98
2024-07-08 10:26:16 +00:00
Mike McTernan
84d0877511 APC/TUI: remove support for APC
Flag: EXEMPT build file change
Bug: 351151445
Test: m && test on device
Change-Id: I927fd5063cd12b94d63fff3057ae54cee75e908d
2024-07-04 14:55:39 +00:00
Juan Yescas
bf9f082f67 16kb: Use TARGET_BOOTS_16K to select the efs config files
Test: Build and test pgagnostic targets
Bug: 350529323
Bug: 346868433
Flag: EXEMPT bugfix
Change-Id: I1e0bea52de09fe3c9ee2f52b0803882456943833
2024-07-03 03:00:32 +00:00
liangjlee
bb51950bad zuma: Include power/power.mk am: 94babd7bcc
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/28060256

Change-Id: I0d8850ec9ce7e2519f87c1455429a0e139d1568c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-07-02 09:36:37 +00:00
Treehugger Robot
2fa3c6b55d Merge "16kb: Use PRODUCT_BOOTS_16K to select the proper rc file and fstab" into main 2024-06-28 23:29:29 +00:00
Juan Yescas
98f2222e27 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: 346868433
Test: Built Pixel 8 targets
      $ source build/envsetup.sh
      $ lunch husky_pgagnostic-trunk_staging-userdebug
      $ get_build_var DEVICE_PAGE_AGNOSTIC
      $ get_build_var TARGET_KERNEL_DIR
      device/google/shusky-kernels/6.1/trunk-12010727/16kb
      $ get_build_var TARGET_BOARD_KERNEL_HEADERS
      device/google/shusky-kernels/6.1/trunk-12010727/kernel-headers
      $ get_build_var PRODUCT_BOOTS_16K
      true
      $ get_build_var TARGET_RW_FILE_SYSTEM_TYPE
      ext4
      $ get_build_var TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE
      ext4
Flag: EXEMPT bugfix
Change-Id: I4dba20518925a176f1e1e66596e2bb1e8ade7c26
2024-06-28 18:50:20 +00:00
liangjlee
94babd7bcc zuma: Include power/power.mk
Bug: 331612600
Flag: EXEMPT (bug 337358613)
Change-Id: I370cd115855b43d890dd488de65572593b238efb
Signed-off-by: liangjlee <liangjlee@google.com>
2024-06-27 02:27:19 +00:00
Roy Luo
12f2e55257 Use absolute path for udc device
Avoid search in /sys/class/udc directory

Bug: 339241080
Test: tested on Shiba
Flag: EXEMPT bugfix
Change-Id: Iad74cae0d6ad6887d79d705dc8478f1b44532503
2024-06-26 22:59:30 +00:00
liangjlee
48c79683bc zuma: Include power/power.mk
Bug: 331612600
Flag: EXEMPT (bug 337358613)
Change-Id: I370cd115855b43d890dd488de65572593b238efb
Signed-off-by: liangjlee <liangjlee@google.com>
2024-06-27 02:16:51 +08:00
Juan Yescas
c42244bfb6 Merge "Change CopyEfsTest to test contents" into main 2024-06-25 16:37:46 +00:00
Julien Desprez
dca09aa056 Tag CopyEfsTest as device-pixel-tests
This will allow to run the tests out of the pixel tests set rather than the super large device-tests set. Which will save build resources.

Flag: TEST_ONLY
Change-Id: I7d902662dff05dfdc88808c5647793ff5bde6107
Test: presubmit
Bug: 342232954
2024-06-25 14:55:06 +00:00
Daniel Rosenberg
3319a13fee Change CopyEfsTest to test contents
4k mode devices no longer set up redirection, so the old test would fail
now. Instead, this tests that the contents of the copied partitions will
match. Since the partitions are mounted and could change, we work off of
a copy.

Change-Id: Ia98517bb4ede9cb3416132e815da9b87728423a6
Signed-off-by: Daniel Rosenberg <drosen@google.com>
Flag: TEST_ONLY
Bug: 347744178
Test: atest CopyEfsTest
2024-06-24 17:20:54 -07:00
Kelvin Zhang
48ca1bcab6 Merge "Mount persist partition in early-init" into main 2024-06-24 17:47:29 +00:00
YiKai Peng
cb368db9b8 Merge "zuma: wlc: add authstart permission" into main 2024-06-21 04:05:42 +00:00
Kelvin Zhang
73a68dd6d3 Mount persist partition in early-init
The graphics hal might need to access /persist early in the boot
process. So mount persist early for 4K devices.

Test: boot 4K device
Bug: 338504890
Change-Id: I4b2a0a61ebaff5d85a4daac445d81ae3d21aa9c3
2024-06-20 21:04:40 -07:00
Xin Li
23c385e7da [automerger skipped] Merge 24Q3 (ab/11976889) to aosp-main-future am: 80cfd703d6 -s ours
am skip reason: Merged-In I38eef1dff949c4275bf0b355582238678a6894a7 with SHA-1 120974a4b1 is already in history

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

Change-Id: I7c7aba2e51fdcb33140f33d5e648a238e5b2988a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-20 21:16:39 +00:00
Kelvin Zhang
763984677a Only copy efs files to /data if device is 16K page size
Test: Boot device, test dev options
Bug: 341216848

Change-Id: I0bf328b8ff90e125dcbca5261fb8dd4e0ad458d8
2024-06-20 11:13:41 -07:00
YiKai Peng
579a541f26 zuma: wlc: add authstart permission
Bug: 348272247
Test: Build/Flash
Flag: EXEMPT bugfix
Change-Id: I881dd032c7dbcc8bca55c1346e02d21b1f2c0145
Signed-off-by: YiKai Peng <kenpeng@google.com>
2024-06-20 06:29:49 +00:00
Xin Li
80cfd703d6 Merge 24Q3 (ab/11976889) to aosp-main-future
Bug: 347831320
Merged-In: I38eef1dff949c4275bf0b355582238678a6894a7
Change-Id: I46d9c1d5e2e949cdb9e262921d2f1f4d220d7cba
2024-06-18 14:13:24 -07:00
Treehugger Robot
2720a57023 Merge "Remove unused device/google/zuma/Android.mk" into main am: 60384da8cb am: ba186ad62c
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3135713

Change-Id: I729eac86f45d142a7e07cbbb9166ef8eb2e3e39a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-18 10:02:14 +00:00
Treehugger Robot
ba186ad62c Merge "Remove unused device/google/zuma/Android.mk" into main am: 60384da8cb
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3135713

Change-Id: Ic86a2eaaf957d7f9a52cafb7ba11c440ca1f280b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-18 09:27:42 +00:00
Treehugger Robot
60384da8cb Merge "Remove unused device/google/zuma/Android.mk" into main 2024-06-18 09:09:15 +00:00
Xin Li
54f9d0f7b0 Merge Android 14 QPR3 to AOSP main am: c3387ab656 am: 1aade33ca5
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3132134

Change-Id: Id0a170bed1efab623f82bba624849ef71356a29a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-18 05:55:36 +00:00
Xin Li
1aade33ca5 Merge Android 14 QPR3 to AOSP main am: c3387ab656
Original change: https://android-review.googlesource.com/c/device/google/zuma/+/3132134

Change-Id: Ib7a8ed951ffe015060bb9ba2f69171fad85243b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-17 20:41:21 +00:00
Treehugger Robot
735afdceb3 Merge "Remove CopyEfsTest from test mapping" into main 2024-06-17 19:02:12 +00:00
Kelvin Zhang
cf0619c40d Remove CopyEfsTest from test mapping
treehugger does not have any test suite setup for zuma target,
and CopyEfsTest should only be run on zuma targets. So remove
from test mapping to unbreak tests.

Test: th
Bug: 347396961
Change-Id: I079d24cae4808d3370c3821412640f7fef1d0cc7
2024-06-17 11:13:53 -07:00
Herbert Xue
2c8e3651e4 Remove unused device/google/zuma/Android.mk
There is no other Android.mk under subdirectory of device/google/zuma.

Bug: 347619275
Test: NA
Change-Id: I7a5e9afb1ccb75ed66e947a3fa1e0bda2c2223b6
2024-06-17 13:48:03 +08:00
Treehugger Robot
d17f068362 Merge "Add test for copy_efs_files_to_data script" into main 2024-06-14 21:37:11 +00:00
Kelvin Zhang
120974a4b1 Add test for copy_efs_files_to_data script
Test: atest CopyEfsTest
Bug: 346551655
Change-Id: I38eef1dff949c4275bf0b355582238678a6894a7
2024-06-14 13:12:19 -07:00
Xin Li
c3387ab656 Merge Android 14 QPR3 to AOSP main
Bug: 346855327
Merged-In:
Change-Id: I6e2d2db806623c6e6676d852eb62af6b426e9438
2024-06-13 10:49:16 -07:00
Kyle Tso
d17fdff5f8 usb: Log for retry on role switch
Add a log for the retry. Also define the sleep time in the header file.

Bug: 341996696
Change-Id: Ib3cc0c6ad576e7cda26b7f50cdc61d52e6349c78
Signed-off-by: Kyle Tso <kyletso@google.com>
2024-06-13 16:54:37 +08:00
Joey Poomarin Phloyphisut
a9b7137ea9 Merge "pixelstats: add speaker_version sysfs for VendorSpeakerStatsReported" into main 2024-06-13 05:53:30 +00:00
Kyle Tso
9500db736e Merge "usb: Add retry on role switch" into main 2024-06-13 03:32:21 +00:00
Treehugger Robot
866d218686 Merge "Enable copy efs files support on pgagnotic target" into main 2024-06-13 02:46:40 +00:00
Salmax Chang
6432f05383 Merge "Restore permission of efs/efs_backup/modem_userdata after mount" into main 2024-06-12 10:25:58 +00:00
Kyle Tso
ef5856a447 usb: Add retry on role switch
Bug: 341996696
Change-Id: I8caa65288af1588d24fea4aa6c5768d45d69bbd5
Signed-off-by: Kyle Tso <kyletso@google.com>
2024-06-12 09:16:17 +00:00
KRIS CHEN
654485385c Merge "zuma: build fingerprint dump" into main 2024-06-12 04:39:32 +00:00
Treehugger Robot
4e845d9517 Merge "Update IDisplay to V12" into main 2024-06-12 03:20:59 +00:00
Kelvin Zhang
d45d697ded Enable copy efs files support on pgagnotic target
pgagnotic targets might boot into 16KB directly(w/o dev options),
in which case it would need copy efs files support to be enabled.

Test: boot device with dev option disabled, check efs
Bug: 346275905
Change-Id: If18bfa0b0646da8008c6d92bec094b236273cbfc
2024-06-11 16:25:52 -07:00
Kelvin Zhang
d3ce2b9873 Restore permission of efs/efs_backup/modem_userdata after mount
Test: Boot device, erase EFS, check selinux labels
Bug: 345803836
Change-Id: Ia511731e001d74409b40b087432e3535ca5cfc8f
2024-06-11 09:13:27 -07:00
Poomarin Phloyphisut
f3a1a067f1 pixelstats: add speaker_version sysfs for VendorSpeakerStatsReported
Bug: 326342880
Test: Local Test
Change-Id: Ib8c93e9297a7afb61005fb523fd664be0a00b459
2024-06-11 05:49:20 +00:00
chenkris
48e1f2418a zuma: build fingerprint dump
Bug: 346450599
Test: adb bugreport
Change-Id: I83f64cb3aa46007dd41674309a811d5f4c5a52a4
2024-06-11 02:51:37 +00:00
Dennis Shen
4ade1a2615 Merge "switch over to use new storage read api instead of server_configurable_flags, this new read api lib will be needed for new codegened aconfig flag lib." into main 2024-06-07 14:16:53 +00:00