Peter (YM)
071e4e0598
Merge "thermal: Move TPU to the VSKIN-SOC PID loop" into main
2024-06-12 03:06:40 +00:00
Joe Onorato
d81c86e9a4
Remove entries for unlunchable targets
...
Bug: 346406752
Test: Treehugger
Change-Id: I1f2f9690e5c70799acb8e15b382c7bc1ae7282d5
2024-06-10 15:10:46 -07:00
Xin Li
51f4af0fdc
[automerger skipped] Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future am: 54ca980874
-s ours
...
am skip reason: Merged-In Ib0b3823368c5124fc6dfce1452f51aee5bf66ba5 with SHA-1 18a613fe00
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/27555656
Change-Id: I0ea2434c2213482d153b2354758f933ddd2dd304
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 21:36:11 +00:00
Steven Moreland
a64dfb0e1d
Merge "Verify shusky prebuilts are 16 KB compatible." into main
2024-06-06 18:20:02 +00:00
Rick Yiu
a7f8dd6047
Merge "Revert "Set big core to group_cfs_skip_mask for sys group"" into main
2024-06-06 06:50:27 +00:00
Rick Yiu
be6417f824
Merge "Revert "Set big core to cpu skip mask by default"" into main
2024-06-06 06:50:16 +00:00
Rick Yiu
5d7958215d
Revert "Set big core to cpu skip mask by default"
...
This reverts commit c6609a4bb9
.
Reason for revert: 24Q3 kernel prebuilt not ready
Bug: 248621289
Change-Id: I53abd0932443fa437a487255b74e06dad18f7b9f
Test: build pass
2024-06-06 03:02:13 +00:00
Rick Yiu
d6c3e07eb4
Revert "Set big core to group_cfs_skip_mask for sys group"
...
This reverts commit 83bdd31a60
.
Reason for revert: 2dQ3 kernel prebuilt not ready
Bug: 248621289
Change-Id: I34c8616bc6b39e178c665a77c266c2a60438a651
Test: build pass
2024-06-06 03:01:52 +00:00
Xin Li
54ca980874
Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future
...
Bug: 343100748
Merged-In: Ib0b3823368c5124fc6dfce1452f51aee5bf66ba5
Change-Id: Id7135d0505aa936207c761f04fb60c1017c125a9
2024-06-05 14:12:12 -07:00
Ankur Bakshi
755f1354b7
Merge "Update shiba SVN to 27" into main
2024-06-05 19:23:16 +00:00
Peter (YM)
d3b792b4eb
thermal: Move TPU to the VSKIN-SOC PID loop
...
Bug: 345115917
Test: run TPU test
Change-Id: I372473dcedc35ea82ccc739f0ac185a8a83dfa53
Signed-off-by: Peter (YM) <peterym@google.com>
2024-06-05 07:24:55 +00:00
Rick Yiu
12274aa885
Merge "Set big core to cpu skip mask by default" into main
2024-06-05 01:15:22 +00:00
Steven Moreland
2b195c3b0d
Verify shusky prebuilts are 16 KB compatible.
...
Bug: 342466032
Test: build only
Change-Id: I7025cd2a02904c9bb974112f0f70368325b89d7f
2024-06-05 00:07:37 +00:00
Wei Wang
8c35d8a05c
Merge "Set big core to group_cfs_skip_mask for sys group" into main
2024-06-04 16:06:57 +00:00
Rick Yiu
c6609a4bb9
Set big core to cpu skip mask by default
...
Also reset the mask for launch and other camera streaming modes that
do not use it.
Bug: 248621289
Test: build pass
Change-Id: Id2f8f203359d4551d17f9b6ba02ee1c8e805fa3c
2024-06-04 14:00:14 +00:00
Cyan_Hsieh
6a90c104cd
Switch makefile owners to MK_OWNERS am: f9d1717851
am: 6adc787300
...
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/3107250
Change-Id: I08b7e0cd3c54670576fb95ca574f3a3e1b68aa20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 22:00:00 +00:00
Xin Li
818ad7c14b
Merge changes from topic "am-36173d5d8d894981aebd5978e1093e94" into main
...
* changes:
[automerger skipped] Merge "Merge Android 24Q2 Release (ab/11526283) to aosp-main-future" into aosp-main-future am: a547255f56
-s ours
[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: cd35c7dfcf
-s ours
2024-05-29 21:40:02 +00:00
Xin Li
566d1afb35
[automerger skipped] Merge "Merge Android 24Q2 Release (ab/11526283) to aosp-main-future" into aosp-main-future am: a547255f56
-s ours
...
am skip reason: Merged-In I67dc687f1751a17b6ff1431697a380b82d53c799 with SHA-1 bd5841248b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/27273752
Change-Id: If2dc42fb65cbca87a31271ba35a49931d5bcf43b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 20:52:43 +00:00
Xin Li
8919d1e65a
[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: cd35c7dfcf
-s ours
...
am skip reason: Merged-In I67dc687f1751a17b6ff1431697a380b82d53c799 with SHA-1 bd5841248b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/27273752
Change-Id: I738b5c1262cc1b202eb344cb1661a9df1a2f413f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 20:49:02 +00:00
Xin Li
37c3f9e9ed
[automerger skipped] Merge "Merge Android 24Q2 Release (ab/11526283) to aosp-main-future" into aosp-main-future am: a547255f56
-s ours
...
am skip reason: Merged-In I67dc687f1751a17b6ff1431697a380b82d53c799 with SHA-1 bd5841248b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/27273752
Change-Id: I4623b3d9e1bc0a9830818a0e0df54f08c4b72e50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 19:49:08 +00:00
Xin Li
ae97470105
[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: cd35c7dfcf
-s ours
...
am skip reason: Merged-In I67dc687f1751a17b6ff1431697a380b82d53c799 with SHA-1 bd5841248b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/27273752
Change-Id: I9fbd95fb7e20229de0f556aff42f5870dfe3531f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 19:44:43 +00:00
Cyan_Hsieh
6adc787300
Switch makefile owners to MK_OWNERS am: f9d1717851
...
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/3107250
Change-Id: I7c5462d4232579733a1d707782c2dcf429c4159b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 14:29:14 +00:00
Cyan_Hsieh
f9d1717851
Switch makefile owners to MK_OWNERS
...
Bug: 278167548
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:aa3eb14d33c1b5f93fb7f496eb625f3829d1325d )
Merged-In: I58886a7c812960f7ef7d14a4d9c0b0ccabd4b8ef
Change-Id: I58886a7c812960f7ef7d14a4d9c0b0ccabd4b8ef
2024-05-29 10:00:43 +00:00
Xin Li
a547255f56
Merge "Merge Android 24Q2 Release (ab/11526283) to aosp-main-future" into aosp-main-future
2024-05-24 21:16:08 +00:00
Vilas Bhat
3769d377bd
16k: shusky: Remove developer option from AOSP pgagnostic targets am: c7b8d16d38
am: 55b37a6818
...
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/3102537
Change-Id: Ie421e448f5bff32cf21fb5301d648582c691d3d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-24 20:55:30 +00:00
Vilas Bhat
55b37a6818
16k: shusky: Remove developer option from AOSP pgagnostic targets am: c7b8d16d38
...
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/3102537
Change-Id: I7809828518ba83afa7cc668f2a3eb46c6d7dd966
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-24 20:38:25 +00:00
Vilas Bhat
c7b8d16d38
16k: shusky: Remove developer option from AOSP pgagnostic targets
...
Page agnostic (16k targets) are already supposed to boot up with 16k
page size kernels. Hence, the developer option is not required.
Bug: 340969437
Test: Tested `aosp_shiba_pgagnostic` on internal branch to ensure the
build succeeds and device boots up.
Change-Id: I9fd4011d868f282364c1dedc048531ca2a32c843
2024-05-24 18:32:44 +00:00
Rick Yiu
83bdd31a60
Set big core to group_cfs_skip_mask for sys group
...
Set big core to group_cfs_skip_mask for sys group when screen is off,
so that sys group tasks will run less in big core.
Bug: 328210236
Test: build pass
Change-Id: I9ccb3035a480e88960951222c45d0ca8352082d9
2024-05-24 13:50:26 +00:00
Pawan Wagh
84bde1ec6e
Merge "Move boot_otas to /vendor" into main
2024-05-23 22:42:39 +00:00
Pawan Wagh
886e2a864e
Merge "Use husky specific flag for dev options" into main
2024-05-23 22:29:00 +00:00
Pawan Wagh
b91082483f
Use husky specific flag for dev options
...
Husky and shiba might use different kernels moving forward and
dev options should be controlled by separate flags on husky and
shiba.
Test: Build husky-trunk_staging-userdebug
Bug: 342011434
Change-Id: I8c855c95d99e4e4b3f2233179f368bcbb63a9720
2024-05-23 20:25:17 +00:00
Treehugger Robot
2043d49aac
Merge "audio: remove unused device" into main
2024-05-23 08:29:53 +00:00
Pawan Wagh
d8e6c573fc
Move boot_otas to /vendor
...
Test: Boot device and use developer options.
Test: $ adb shell ls -l /vendor/boot_otas/
total 11712
-rw-r--r-- 1 root root 5980771 2024-05-21 17:36 boot_ota_16k.zip
-rw-r--r-- 1 root root 6007912 2024-05-21 17:36 boot_ota_4k.zip
Bug: 295035851
Bug: 318887939
Change-Id: I15a225aaa068a9a215d9aadc9c7b0e5f16edbc53
2024-05-21 22:09:39 +00:00
Pawan Wagh
ccbf84d1ae
Merge "Use BOARD_16K_OTA_USE_INCREMENTAL for shusky" into main
2024-05-20 22:25:38 +00:00
Pawan Wagh
8ecee7602b
Use BOARD_16K_OTA_USE_INCREMENTAL for shusky
...
Bug: 340987520
Bug: 295035851
Test: Boot and test dev options with incremental OTAs
Test: boot shiba and check size difference in boot_ota_16k.zip
boot_ota_4k.zip
Without incremental OTA -> Total size 32 MiB
out/target/product/shiba$ ls -l --block-size=M | grep boot_ota
-rw-r--r-- 1 waghpawan primarygroup 16M May 20 17:11 boot_ota_16k.zip
-rw-r--r-- 1 waghpawan primarygroup 16M May 20 17:11 boot_ota_4k.zip
With incremental OTA -> Total size 12 MiB
ls -l --block-size=M | grep boot_ota
-rw-r--r-- 1 waghpawan primarygroup 6M May 20 16:14 boot_ota_16k.zip
-rw-r--r-- 1 waghpawan primarygroup 6M May 20 16:14 boot_ota_4k.zip
Change-Id: I52e07fdc7f781f0c59ac6957e34af1967a3efb92
2024-05-20 17:15:06 +00:00
Ravi Jain
1e6976040c
Merge "Vibrator: Set Soong Config variable - kernel_ver" into main
2024-05-20 11:00:39 +00:00
Ravi Jain
f080086bd2
Vibrator: Set Soong Config variable - kernel_ver
...
Bug: 340148508
Test: Build and check fw files in all devices.
Change-Id: Ic0e1a84d606f2cb86d498b2508babd126a11eda0
2024-05-20 06:49:57 +00:00
Pawan Wagh
f9d38daaae
Use TARGET_KERNEL_DIR in Dev options config
...
Shiba and husky may use different kernel versions moving
forward.
Test: m
Bug: 295035851
Change-Id: I148d17ef6f85ae96488aef1f9b40fb3fedb35c69
2024-05-17 22:08:13 +00:00
Xin Li
cd35c7dfcf
Merge Android 24Q2 Release (ab/11526283) to aosp-main-future
...
Bug: 337098550
Merged-In: I67dc687f1751a17b6ff1431697a380b82d53c799
Change-Id: I9854060d05a23ac0a21b51d62ab5831d17e765a4
2024-05-17 11:03:46 -07:00
Pawan Wagh
443b449e02
16kb: Setup 16k OTA config for [husky|shiba] targets
...
Enabling developer option based on trunk stable flags
- RELEASE_GOOGLE_HUSKY_16K_DEVELOPER_OPTION
- RELEASE_GOOGLE_SHIBA_16K_DEVELOPER_OPTION
This change includes
- conditional config for 16kb developer option in [husky|shiba] targets.
- Path setup required for OTA generation for 16kB developer options.
Test: $ source build/envsetup.sh
$ lunch husky-trunk_staging-userdebug
$ get_build_var TARGET_KERNEL_DIR_16K
device/google/shusky-kernels/5.15/trunk-11828503/16kb
$ get_build_var RELEASE_KERNEL_HUSKY_DIR
device/google/shusky-kernels/5.15/trunk-11828503
$ m
Bug: 295035851
Change-Id: Ie88f22b9cd2fb8ba233683650fcdb4e79810e564
2024-05-16 00:06:45 +00:00
Steven Moreland
89d2eccd64
Merge "16kb: Set ext4 filesystem for data/metadata partition in pgagnostic targets" into main
2024-05-15 16:46:04 +00:00
Cyan Hsieh
b754c345ff
Merge "Update bootloader pdk folder and soong config" into main
2024-05-15 14:01:33 +00:00
Juan Yescas
d83a4ff79b
16kb: Set ext4 filesystem for data/metadata partition in pgagnostic targets
...
Test: Built shusky agnostic target
Bug: 333734531
Bug: 308663811
Change-Id: Ia14228aec87eefffd04c96a408e80bd8d3c344a1
2024-05-14 17:50:38 -07:00
Juan Yescas
fab6a485f9
16kb: Use RELEASE_KERNEL_SHIBA_DIR for shiba targets
...
Test: Built locally
Bug: 333734531
Bug: 308663811
Change-Id: I6190bd55ac2e7007df4f6cab5b64a0666e0a0314
2024-05-14 23:59:34 +00:00
Xin Li
ddec229eb1
Update LOCAL_CERTIFICATE to PRESIGNED for ShannonRcs am: 6e246c5334
am: d429a0c1c2
...
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/3081864
Bug: 340575463
Fixed: 340575463
Change-Id: If2775ce1372c87b0052060ea640e71141e813e70
2024-05-14 17:42:56 +00:00
Alexander Koskovich
d429a0c1c2
Update LOCAL_CERTIFICATE to PRESIGNED for ShannonRcs am: 6e246c5334
...
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/3081864
Change-Id: I0b375d0599e802a16ef4bfac59c304a759f323ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-14 16:36:56 +00:00
Juan Yescas
9ba0df1300
16kb: Configure the file system and kernel for pgagnostic targets
...
Test: $ source build/envsetup.sh
$ lunch husky_pgagnostic-trunk_staging-userdebug
$ get_build_var TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE
ext4
$ get_build_var TARGET_KERNEL_DIR
device/google/shusky-kernels/5.15/trunk-11828503/16kb
Bug: 333734531
Bug: 308663811
Change-Id: I8d69e4df68303351a9d402c4d458061c72499cd7
2024-05-13 17:13:50 -07:00
Treehugger Robot
cdb0fb1526
Merge "gps: Reduce logging mask" into main
2024-05-13 01:50:58 +00:00
Alexander Koskovich
6e246c5334
Update LOCAL_CERTIFICATE to PRESIGNED for ShannonRcs
...
Test: No more denials when it tries to find IOemSlsiRadioExternal.
Change-Id: I01f8d8fc3262909400ab1c6598017d045ba27625
2024-05-12 07:36:03 -04:00
Android Build Coastguard Worker
266331c226
Merge cherrypicks of ['googleplex-android-review.googlesource.com/27242056', 'googleplex-android-review.googlesource.com/27264407'] into 24Q2-release.
...
Change-Id: I6ee9afb01b9054b1325e02b3fdf02236b053c09b
2024-05-10 18:00:20 +00:00