Commit graph

3012 commits

Author SHA1 Message Date
Chaohui Wang
a1346df3f0 Update regulatory_info_gpj41_in.png
Bug: 307193134
Test: presubmit
Change-Id: I6f48c0a8c7700563dee83779062c763b20839638
2024-05-07 11:54:48 +08: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
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
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
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
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
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
Kyle Hsiao
f3cbfdf2a8 Merge "Enable secure NFC support" into main 2024-04-22 04:01:14 +00:00
Kyle Hsiao
48ee7f3da8 Enable secure NFC support
Bug: 314858460
Test: manual
Change-Id: Id2f3c5963f5027a04ba557b1615d53366552711f
2024-04-22 03:19:58 +00:00
Treehugger Robot
d34ee0e34b Merge "Switch bootloader directory to control by build flag" into main 2024-04-19 06:38:45 +00:00
Treehugger Robot
6358b83b19 Merge "adpf:shusky: update hboost jank check time factor." into main 2024-04-19 02:32:32 +00:00
guibing
01660ca736 adpf:shusky: update hboost jank check time factor.
Update it to align with the HWUI target duration scale factor,
so the adjusted jank check time duration is same as expected frame
timeline's duration.

HWUI target duration scale factor is 70%, and its inverse value is
approximately 1.43.

Bug: 204204746
Test: adb shell dumpsys android.hardware.power.IPower/default;
      Check the device adpf sessions' traces.
Change-Id: I8565fa1352769e6f879ea5fc12412d00f254da3b
2024-04-18 22:52:12 +00:00
Cyan_Hsieh
7e6f1e6cf0 Switch bootloader directory to control by build flag
Bug: 333834221
Change-Id: I71813042214ef6407b6389a1f2e57c1ffd84a2f9
2024-04-18 16:27:53 +08:00
Treehugger Robot
ae15605e66 Merge "audio: update opus support format" into main 2024-04-17 18:09:26 +00:00
Poomarin Phloyphisut
9aa8fd6d35 [USB Audio AIDL] Add mixer path for "usb-device-microphones"
Bug: 329147872
Test: Local test
Change-Id: I8d68a7af2605ea0d34baae0bc2dbdee8d5df3c05
2024-04-17 04:16:22 +00:00
Juyu Chen
e442d42a04 audio: update opus support format
Bug: 329872757
Test: cts tests

Change-Id: Ie2dd241a1d104028a0ebacc77efc12b6972e226b
Signed-off-by: Juyu Chen <juyuchen@google.com>
2024-04-16 04:11:12 +00:00
Wei Wang
6ae60dd4b7 Merge "adpf:shusky: add hboost junk detection time factor into power hint json files." into main 2024-04-16 03:50:58 +00:00
Charles Yo
21a104891d Merge "Switch kernel directory to control by build flag" into main 2024-04-16 01:34:48 +00:00
guibing
e6fe682d22 adpf:shusky: add hboost junk detection time factor into power hint json files.
Bug: 204204746
Test: adb shell dumpsys android.hardware.power.IPower/default;
      Check the device adpf sessions' traces.
Change-Id: If4c116e172b101eebe8a8b9b539f3a55e4299ca8
2024-04-16 00:17:11 +00:00
Benson Li
7238f5c62e Add system property for concurrent encryption on LE and BR/EDR
Bug: 330704060
Change-Id: I31f8bcb49359473d52474231b6e777c62109ae51
Test: make
2024-04-15 12:14:27 +00:00
Treehugger Robot
6fdf23cbf2 Merge "shusky: Add heuristic boost configs in power hint json files." into main 2024-04-13 01:33:50 +00:00
guibing
97c7f4861e shusky: Add heuristic boost configs in power hint json files.
Bug: 204204746
Test: Power hal launches in device without configuration parsing issue.
Change-Id: I5f85f88699b468f2c5e0af05dcea0bfa3fba56d2
2024-04-12 23:29:12 +00:00
Cyan_Hsieh
38562b32f8 Switch kernel directory to control by build flag
Bug: 309749142
Change-Id: If82fdbbd87cccba0763479e075289efd739e7e34
2024-04-12 18:35:02 +08:00
Juan Yescas
bba25ed8e0 16kb: 16kb: Remove shusky pg agnostic am: 10c2808197 am: 5f2657e2a9
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/3039896

Change-Id: I9b3c8446a9f06ffda4a7c5b7343e206682f276f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-12 02:11:07 +00:00