Commit graph

3043 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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