Commit graph

3250 commits

Author SHA1 Message Date
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
f893c39d0d Snap for 11784291 from 8196de6572 to 24Q3-release
Change-Id: Id6b343cab877c77821a42f450e63e9c1ac806c0f
2024-04-30 23:04:06 +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
Xin Li
8196de6572 [automerger skipped] Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future am: cee9101b80 -s ours
am skip reason: Merged-In I737cfc43bb7fade480c49cab06ff605ad51fa131 with SHA-1 5dfae29d62 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky-sepolicy/+/27145057

Change-Id: I7bf5775c0c362b08192e18664bcee1667381af15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-30 02:10:29 +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
Xin Li
cee9101b80 Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future
Bug: 337098550
Merged-In: I737cfc43bb7fade480c49cab06ff605ad51fa131
Change-Id: Idace9daec9667ec4d793c5feb3a4bd4110188eda
2024-04-29 11:48:19 -07: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
Ankur Bakshi
788df5e27e Update husky SVN to 26
Bug: 336526332
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:18c172a4907acae43bd21d9bb5c6162a9f8b7d81)
Merged-In: I9921b837eebe742953ac8d7300d6131bd39e2495
Change-Id: I9921b837eebe742953ac8d7300d6131bd39e2495
2024-04-26 01:55:07 +00:00
Ankur Bakshi
c81a36eaf2 Update shiba SVN to 26
Bug: 336526332
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ee1d0f353aeb90ac6beb1a65789cdfd7aa32a862)
Merged-In: I10f3ff0994ce6c6f15fe73f721aad6ce7408e99b
Change-Id: I10f3ff0994ce6c6f15fe73f721aad6ce7408e99b
2024-04-26 01:54:55 +00:00
Nelson Li
0f85bf8c76 Refactor product inheritance for shiba products
Add an additional layer of inheritance for `aosp_shiba`,
`aosp_shiba_fullmte`, and `aosp_shiba_pgagnostic`.

This change adds a common layer of inheritance (shiba_generic.mk)
for non-factory products. This makes it easier to configure factory
and non-factory products differently.

Non-factory `shiba` products now inherits from
`device/google/shusky/shiba_generic.mk` which inherit from
`device/google/shusky/device-shiba.mk`.

aconfig flags: Flag: EXEMPT mechanical refactoring
build flags: Flag: EXEMPT mechanical refactoring

Bug: 332219400
Bug: 335567293
Test: lunch aosp_shiba-trunk_staging-userdebug && m
      lunch aosp_shiba_fullmte-trunk_staging-userdebug && m
      lunch aosp_shiba_pgagnostic-trunk_staging-userdebug && m

Change-Id: Ib825430eaf56c1395c0d955a4bbc46e5512f14b8
2024-04-26 01:38:22 +00:00
Nelson Li
71e02ec7d9 Refactor product inheritance for ripcurrent products
Add an additional layer of inheritance for `aosp_ripcurrent` and
`aosp_ripcurrent`.

This change adds a common layer of inheritance(ripcurrent_generic.mk)
for non-factory products. This makes it easier to configure factory
and non-factory products differently.

non-factory `ripcurrent` products now inherits from
`device/google/shusky/ripcurrent_generic.mk` which inherit from
`device/google/shusky/device-ripcurrent.mk`.

aconfig flags: Flag: EXEMPT mechanical refactoring
build flags: Flag: EXEMPT mechanical refactoring

Bug: 332219400
Bug: 335564645
Test: lunch factory_ripcurrent-trunk_staging-userdebug && m
      lunch aosp_ripcurrent-trunk_staging-userdebug && m
      lunch aosp_ripcurrent_fullmte-trunk_staging-userdebug && m
Change-Id: Ieb552a075e35215cb027b6d5a91d84168d9e6a45
2024-04-26 01:09:20 +00:00
Ankur Bakshi
515a7dbe70 Merge "Update husky SVN to 27" into main 2024-04-26 00:25:27 +00:00
Ankur Bakshi
39a85a735c Merge "Update husky SVN to 26" into main 2024-04-26 00:25:19 +00:00
Ankur Bakshi
c7f5c0c3d8 Merge "Update shiba SVN to 26" into main 2024-04-26 00:25:05 +00:00
Android Build Coastguard Worker
58f8fec3e7 Snap for 11766482 from 388f467765 to 24Q3-release
Change-Id: I331cf25ac65c58bac783cf339541764e691e9c9c
2024-04-25 23:03:18 +00:00
guibing
340d8f1f91 Adpf:shusky: revert heuristic boost triggering condition.
This reverts previous JankCheckTimeFactor from 1.43 to 1.2.

Since the current reported duration doesn't include the GPU
part, the JankCheckTimeFactor needs to be smaller for matching
jank frame detection.

Bug: 204204746
Test: adb shell dumpsys android.hardware.power.Ipower/default;
      check adpf sessions' traces.
Change-Id: I9c7587b6b1507fae685561fcf008c5ab9ae73532
2024-04-25 22:52:15 +00:00
Thomas Girardier
880e707175 Revert "bt: set system property Auto-On to false by default"
This reverts commit 2ee76c4e8f.

Reason for revert: Auto On has been approved for 24Q3

Change-Id: I632b92cd1facf4a1548cecaf3c74627d5d7058c5
2024-04-25 16:23:15 +00:00
Treehugger Robot
388f467765 Merge "Switch kernel directory to control by build flag" into main 2024-04-25 08:43:40 +00:00
Randall Huang
8e7bd1260e Switch kernel directory to control by build flag
Bug: 334076212
Test: local build
Change-Id: Ib170f5253fae70f415cc920aa26a911500a69a8b
Signed-off-by: Randall Huang <huangrandall@google.com>
2024-04-25 16:00:36 +08:00
Ankur Bakshi
ad5cbe7e1d Update husky SVN to 27
Bug: 336526332
Change-Id: If58957f829a5e1e7ce3180dcff86a1fc67cb0263
2024-04-25 03:52:00 +00:00
Ankur Bakshi
0d8f79ac75 Update shiba SVN to 27
Bug: 336526332
Change-Id: I4f73498adb2f1dd69794889c1d9311d5d81cacaa
2024-04-25 03:49:58 +00:00
Ankur Bakshi
ee1d0f353a Update shiba SVN to 26
Bug: 336526332
Change-Id: I10f3ff0994ce6c6f15fe73f721aad6ce7408e99b
2024-04-24 19:06:27 +00:00
Ankur Bakshi
18c172a490 Update husky SVN to 26
Bug: 336526332
Change-Id: I9921b837eebe742953ac8d7300d6131bd39e2495
2024-04-24 01:09:29 +00:00
Android Build Coastguard Worker
0e9274c95a Snap for 11746631 from f3cbfdf2a8 to 24Q3-release
Change-Id: I5c5762516a551b673b51da87b7b39219454b9509
2024-04-22 23:02:59 +00:00