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
leonardian
c727cf6fc5
conf: Enable access for braking time sysfs nodes
...
Sysfs nodes:
- braking_time_bank
- braking_time_index
- braking_time_ms
Bug: 325121485
Test: Open sysfs nodes successfully during HAL init
Change-Id: I88f59ca68028ea7fe1c2a7e61c6bf61ab647169b
Signed-off-by: leonardian <leonardian@google.com>
2024-05-17 12:07:42 +00:00
Android Build Coastguard Worker
ffbb5db763
Snap for 11853201 from 443b449e02
to 24Q3-release
...
Change-Id: I6c354b7525a1fadae65a7fff3ee0a19cb4b441a5
2024-05-17 01:02:55 +00:00
Android Build Coastguard Worker
764f994f9b
Snap for 11847214 from 89d2eccd64
to 24Q3-release
...
Change-Id: I073b91fea2963d85cd48c353417f05a4c86418b0
2024-05-16 01:03:31 +00: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
Android Build Coastguard Worker
cfb2939784
Snap for 11840485 from ddec229eb1
to 24Q3-release
...
Change-Id: I9dfacf15d037f829ef2cf73d0101a7bdf38257c6
2024-05-14 23:03:20 +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
Android Build Coastguard Worker
128dfb2737
Snap for 11834877 from cdb0fb1526
to 24Q3-release
...
Change-Id: Iae79125e49af1dd2767f81f8e9ef88f934520a26
2024-05-13 23:03:24 +00: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
Chaohui Wang
464f31269c
Update regulatory_info_gpj41_in.png (2)
...
Bug: 307193134
Test: presubmit
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:18a613fe00ebbb73062d36af76f6d19e891eb32c )
Merged-In: Ib0b3823368c5124fc6dfce1452f51aee5bf66ba5
Change-Id: Ib0b3823368c5124fc6dfce1452f51aee5bf66ba5
2024-05-10 17:59:49 +00:00
Chaohui Wang
de54e2e99a
Update regulatory_info_gpj41_in.png
...
Bug: 307193134
Test: presubmit
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a1346df3f07864fdc068127a761af23f01cb40a2 )
Merged-In: I6f48c0a8c7700563dee83779062c763b20839638
Change-Id: I6f48c0a8c7700563dee83779062c763b20839638
2024-05-10 17:59:34 +00:00
Cheng Chang
6cb24ee344
gps: Reduce logging mask
...
Bug: 267729515
Bug: 312716075
Test: Verification for logging system.
Test: Verification at b/267729515#comment152.
Change-Id: I0180f1f23c5e7169d770a12b70af27d64b49472a
2024-05-10 03:45:06 +00:00
Android Build Coastguard Worker
bb43ddc2b5
Snap for 11822896 from 18a613fe00
to 24Q3-release
...
Change-Id: I94feb728007b7a38f24108a159651365019441db
2024-05-09 23:07:56 +00:00
Chaohui Wang
18a613fe00
Update regulatory_info_gpj41_in.png (2)
...
Bug: 307193134
Test: presubmit
Change-Id: Ib0b3823368c5124fc6dfce1452f51aee5bf66ba5
2024-05-09 13:55:06 +08:00
Android Build Coastguard Worker
6442c737ae
Snap for 11811809 from a1346df3f0
to 24Q3-release
...
Change-Id: Iaede1b6ed5ae0ae0053f5595907b9e7c3d066aa2
2024-05-07 23:03:35 +00:00
Chaohui Wang
a1346df3f0
Update regulatory_info_gpj41_in.png
...
Bug: 307193134
Test: presubmit
Change-Id: I6f48c0a8c7700563dee83779062c763b20839638
2024-05-07 11:54:48 +08:00
Cyan_Hsieh
3ba38abf51
Update bootloader pdk folder and soong config
...
Bug: 333834221
Change-Id: I410f06023eabfad6a89a347833acbb90735e99d1
2024-05-06 16:43:11 +08:00
Android Build Coastguard Worker
e8c408bc7d
Snap for 11800966 from dfbfadeb46
to 24Q3-release
...
Change-Id: I552539620b6e07ca0cc57ceed96778a77e3aac6a
2024-05-04 01:03:26 +00:00
Qian-Hao Huang
dfbfadeb46
Load fips140.ko before all other kernel modules
...
Bug: 337838109
Bug: 331791671
Change-Id: Ife4f11cd8be0afc501ca37deef28b7654cbc07d9
Signed-off-by: Qian-Hao Huang <qhhuang@google.com>
2024-05-02 13:15:37 +00:00
Android Build Coastguard Worker
1ded87eaec
Snap for 11784291 from d7ed1eb8ba
to 24Q3-release
...
Change-Id: Ibad4c20954cdfa8cfd3486b463d56b91cbc0b52d
2024-04-30 23:04:02 +00:00
Treehugger Robot
d7ed1eb8ba
Merge "Convert p23_common/preloaded_nanoapps.json's .mk file to Android.bp." into main
2024-04-30 05:37:46 +00:00
Vilas Bhat
b79977f369
[automerger skipped] Merge "16kb: Set NO_BIONIC_PAGE_SIZE_MACRO on shusky targets" into main am: f5b6f07062
am: 5244ca8724
-s ours
...
am skip reason: Merged-In Ib005384c58912f53a3294512a175d1c6fd78dbf6 with SHA-1 4604f3b565
is already in history
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/3065626
Change-Id: I71eeea31009201510b0b8535318b3e7dbadae3a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-30 03:23:18 +00:00
Vilas Bhat
5244ca8724
Merge "16kb: Set NO_BIONIC_PAGE_SIZE_MACRO on shusky targets" into main am: f5b6f07062
...
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/3065626
Change-Id: I8c10b678e065601ebdcd1d8d0b1366c2a391e7b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-30 03:04:52 +00:00
Vilas Bhat
f5b6f07062
Merge "16kb: Set NO_BIONIC_PAGE_SIZE_MACRO on shusky targets" into main
2024-04-30 02:37:37 +00:00
Treehugger Robot
eb1e30378a
Merge "Add system property for concurrent encryption on LE and BR/EDR" into main
2024-04-30 02:00:49 +00:00
Vilas Bhat
b62db38cb6
Merge "16kb: Set NO_BIONIC_PAGE_SIZE_MACRO on shusky targets" into main
2024-04-30 00:49:55 +00:00
Juan Yescas
65ba364726
16kb: Update shusky pgagnostic target configuration am: 9cb8882df2
am: 92bef4046b
...
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/3065522
Change-Id: I82191a43bb9507aad06bfc12d1182481d6744300
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-29 21:38:51 +00:00
Juan Yescas
92bef4046b
16kb: Update shusky pgagnostic target configuration am: 9cb8882df2
...
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/3065522
Change-Id: Ia641abdd646cf2055696855fd1f35a0db48581e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-29 21:19:20 +00:00
Vilas Bhat
cdc8605b95
16kb: Set NO_BIONIC_PAGE_SIZE_MACRO on shusky targets
...
Test: source build/envsetup.sh
lunch aosp_{shiba,husky}-trunk_staging-userdebug
get_build_var TARGET_NO_BIONIC_PAGE_SIZE_MACRO
Bug: 310232825
Merged-In: Ib005384c58912f53a3294512a175d1c6fd78dbf6
Change-Id: Ib202adce4cf34c0e30aaa6c27a4c9a18a37f8797
2024-04-29 21:14:13 +00:00
Vilas Bhat
4604f3b565
16kb: Set NO_BIONIC_PAGE_SIZE_MACRO on shusky targets
...
Test: source build/envsetup.sh
lunch aosp_{shiba,husky}-trunk_staging-userdebug
get_build_var TARGET_NO_BIONIC_PAGE_SIZE_MACRO
Bug: 310232825
Change-Id: Ib005384c58912f53a3294512a175d1c6fd78dbf6
2024-04-29 21:11:02 +00:00
Matt Buckley
58ab0d9afb
Merge "Add POWER_EFFICIENCY uclamp max to adpf config" into main
2024-04-29 19:42:14 +00:00
Juan Yescas
9cb8882df2
16kb: Update shusky pgagnostic target configuration
...
The shusky target configuration will support:
- Developer option to switch to 16kb kernel
- 16kb elf alignment for the android platform
Test: source build/envsetup.sh
lunch aosp_husky_pgagnostic-trunk-userdebug
m
Bug: 308663811
Change-Id: I935a3fe7924f1ce2144c5da6b7bddb70247fc8c9
2024-04-29 11:26:27 -07:00
Android Build Coastguard Worker
f6d2539565
Snap for 11772614 from e48dd856cd
to 24Q3-release
...
Change-Id: I66b3d75f576a2804dbdf419cbeb453473e9b6b66
2024-04-27 01:03:10 +00:00
Carter Hsu
07abb4dd58
audio: remove unused device
...
Bug: 337191827
Test: build pass
Change-Id: I6380c8feb03475133f25829a571cb2d3c83eaa22
Signed-off-by: Carter Hsu <carterhsu@google.com>
2024-04-27 02:07:04 +08:00
Nelson Li
1223265afb
Convert p23_common/preloaded_nanoapps.json's .mk file to Android.bp.
...
p23_common includes 4 devices.
Since `preloaded_nanoapps.json` has different configurations for
`factory` products and `non-factory` products, `soong_namespace {}`
needs to be added to the converted Android.bp file to avoid misuse.
Additionally, due to ag/27008138, ag/27046793, ag/27008143, and
ag/27056982, a common inheritance layer has been added to all
`non-factory` products. Therefore, setting different
`PRODUCT_SOONG_NAMESPACES` in the corresponding `<DEVICE>_generic.mk`
and `factory_<DEVICE>.mk` files will allow factory products and
non-factory products to use different preloaded_nanoapps.json.
Bug: 332219400
Test: 1. lunch <device_name>-trunk_staging-userdebug && \
m -j preloaded_nanoapps.json
2. Check ./out/target/product/<device_name>/.../preloaded_nanoapps.json
It should be the <device_name> version.
3. lunch factory_<device_name>-trunk_staging-userdebug && \
m -j preloaded_nanoapps.json
4. Check ./out/target/product/<device_name>/.../preloaded_nanoapps.json
It should be the factory version.
Change-Id: Ife53dddd3469de8eacb6d862bc1b8d9de3ce427e
2024-04-26 06:31:30 +00:00
Treehugger Robot
e48dd856cd
Merge "Refactor product inheritance for husky products" into main
2024-04-26 04:44:16 +00:00
Treehugger Robot
7435e756b6
Merge "Refactor product inheritance for shiba products" into main
2024-04-26 04:44:11 +00:00
Treehugger Robot
a4e93ba694
Merge "Refactor product inheritance for ripcurrent products" into main
2024-04-26 04:44:04 +00:00
Thomas Girardier
c4317fe1d0
Merge "Revert "bt: set system property Auto-On to false by default"" into main
2024-04-26 04:02:59 +00:00
Treehugger Robot
9701c27615
Merge "Adpf:shusky: revert heuristic boost triggering condition." into main
2024-04-26 02:42:19 +00:00
Nelson Li
c30b3ddd53
Refactor product inheritance for husky products
...
Add an additional layer of inheritance for `aosp_husky`,
`aosp_husky_pgagnostic`, and `aosp_husky_fullmte`.
This change adds a common layer of inheritance (husky_generic.mk)
for non-factory products. This makes it easier to configure factory
and non-factory products differently.
Non-factory `husky` products now inherits from
`device/google/shusky/husky_generic.mk` which inherit from
`device/google/shusky/device-husky.mk`.
aconfig flags: Flag: EXEMPT mechanical refactoring
build flags: Flag: EXEMPT mechanical refactoring
Bug: 332219400
Bug: 335567236
Test: lunch aosp_husky-trunk_staging-userdebug && m
lunch aosp_husky_pgagnostic-trunk_staging-userdebug && m
lunch aosp_husky_fullmte-trunk_staging-userdebug && m
Change-Id: Ia4b4c63d12343862655f208cec48995cc2e3a672
2024-04-26 02:02:04 +00:00
Android Build Coastguard Worker
d8fe95cea2
Merge cherrypicks of ['googleplex-android-review.googlesource.com/27086519', 'googleplex-android-review.googlesource.com/27076190'] into 24Q2-release.
...
Change-Id: Ib4dbea953f1ea9c1ff2018779d59adf1a48927ac
2024-04-26 01:55:27 +00:00