Commit graph

2782 commits

Author SHA1 Message Date
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
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
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
Vilas Bhat
f5b6f07062 Merge "16kb: Set NO_BIONIC_PAGE_SIZE_MACRO on shusky targets" into main 2024-04-30 02:37:37 +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
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
Juan Yescas
10c2808197 16kb: 16kb: Remove shusky pg agnostic
Bug: 306537850
Test: N/A
Change-Id: I972e4bf8c94798dd253a4bfb3ea68be854110f07
2024-04-11 18:02:31 -07:00
Juan Yescas
3059034c97 16kb: Set user partition to ext4 in shusky targets
Set user partition to ext4 for the husky and shiba page
size agnostic targets with 5.15 kernels.

Test: source build/envsetup.sh
      lunch aosp_husky_pgagnostic-trunk-userdebug
      m
Bug: 308663811

Change-Id: Iaff7b25e290d05766130d35bd96691b5d407a2e0
2024-03-27 17:52:20 -07:00
Juan Yescas
5af5965511 16k: shusky: Rename PRODUCT_PAGE_SIZE_AGNOSTIC
Rename PRODUCT_PAGE_SIZE_AGNOSTIC to
PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO. When the
PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO build flag is true, the bionic's
macro PAGE_SIZE will be removed. The function getauxval(AT_PAGESZ)
will be used to get the page size instead.

Bug: 312541564
Bug: 308663811
Test: Built target
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:425b1d9864fe1a587bbfd33934b806168aa7f161)
Merged-In: I759223f873ada237abd70def7d38c2da73c046bb

Change-Id: I8ac275774ea14f3044a0be5862f22b32e69df221
2024-03-26 03:58:34 +00:00
Xin Li
a7013b4818 Merge Android 14 QPR2 to AOSP main
Bug: 319669529
Merged-In: I6bf80dc609b0ab9e06e1db8a9711896957a0c137
Change-Id: I0156f661a90d3718676c46ef5da0b1370b4c6a87
2024-03-06 09:29:50 -08:00
Xin Li
be112f4aec Merge Android 24Q1 Release (ab/11220357)
Bug: 319669529
Merged-In: I78ffa902088929a4422bab1a5dbea6534c18b99d
Change-Id: I6bf80dc609b0ab9e06e1db8a9711896957a0c137
2024-01-17 23:27:07 -08:00
Greg Kaiser
e988185191 Fix lunch choices for git_main am: d9a3d4d7dd
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/2886846

Change-Id: Ief5a7840d81770bf3771af9a9cde2474d505c4a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-20 23:27:26 +00:00
Greg Kaiser
d9a3d4d7dd Fix lunch choices for git_main
We add "trunk_staging-" for all COMMON_LUNCH_CHOICES so they are
valid in the trunk stable setup.

Bug: 307738446
Bug: 317213158
Test: lunch
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:748a543cf5b95a759cb9525388ad310c1108bd8a)
Merged-In: I397a8e2cbbca7979a4c4f122df0cc84d7f84bd4b
Change-Id: I397a8e2cbbca7979a4c4f122df0cc84d7f84bd4b
2023-12-20 22:27:37 +00:00
Juan Yescas
e73091e70f 16k: Add aosp shusky page agnostic targets am: c20467a3de
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/2877298

Change-Id: I1481241bb2a8205070948d683618706fab13f8fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-16 03:30:58 +00:00
Juan Yescas
c20467a3de 16k: Add aosp shusky page agnostic targets
Bug: 308663811
Test: source build/envsetup.sh
      lunch aosp_husky_pgagnostic-trunk-userdebug
      m

Merged-In: I759223f873ada237abd70def7d38c2da73c046bb
Merged-In: Idf85cb903cdf2e11df595b495f0313603bc54ead
Change-Id: I7415f8bc96b6b5aad8f2ca26b1eb5b053fb786d7
2023-12-15 17:27:46 -08:00
Cyan Hsieh
835cadfadc Merge "Branch bootloader prebuilts for 24Q2 release" into main 2023-12-14 08:44:11 +00:00
Treehugger Robot
1428094425 Merge "modem: Enable VoLTE with MIF off by default" into main 2023-12-14 00:50:59 +00:00
Cyan_Hsieh
87b8b4e757 Branch bootloader prebuilts for 24Q2 release
Bug: 313350495
Change-Id: I78ffa902088929a4422bab1a5dbea6534c18b99d
2023-12-13 17:13:39 +08:00
Ankur Bakshi
1ecccdc16c Merge "Update husky SVN to 13" into udc-qpr-dev am: 42f15b2bb3 am: 7eb8b757e8
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25620701

Change-Id: I59fb91cb26127563994b6f39bec893ea7b37f65e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12 16:30:18 +00:00
Ankur Bakshi
21ad220ccb Update shiba SVN to 13 am: c2af899c7b am: b4707473d1
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25620331

Change-Id: I801d992de9905e85aec49b6b1ea3e0bd7d1564e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12 16:30:13 +00:00
Ankur Bakshi
7eb8b757e8 Merge "Update husky SVN to 13" into udc-qpr-dev am: 42f15b2bb3
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25620701

Change-Id: I37799ee49228895ba3dfead2b9019f526a3340f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12 15:59:05 +00:00
Ankur Bakshi
b4707473d1 Update shiba SVN to 13 am: c2af899c7b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25620331

Change-Id: Ib712d50da365061bca17bf9c2da9540bf516d8a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12 15:59:02 +00:00
Ankur Bakshi
42f15b2bb3 Merge "Update husky SVN to 13" into udc-qpr-dev 2023-12-12 15:31:32 +00:00
Carter Hsu
215395da95 Merge "audio: Update Fortemedia tuning" into main 2023-12-12 05:48:31 +00:00
Ankur Bakshi
46acf16c61 Merge "Update husky SVN to 12" into udc-qpr-dev am: 19c1d74405 am: d9a7ebc197
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25618059

Change-Id: Ibf750718df855595f8a0f6adfcdaab8aa7242c41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12 00:46:20 +00:00
Ankur Bakshi
440cba4907 Update shiba SVN to 12 am: 2f87d29fbe am: bb98ad7456
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25618000

Change-Id: I34bcacd760a16e521e5499a69ec611c97fd307fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12 00:46:16 +00:00
Ankur Bakshi
d9a7ebc197 Merge "Update husky SVN to 12" into udc-qpr-dev am: 19c1d74405
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25618059

Change-Id: I9bf31f8e51f296c01ca934e1c99b04b477eaa01a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12 00:14:22 +00:00
Ankur Bakshi
bb98ad7456 Update shiba SVN to 12 am: 2f87d29fbe
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/25618000

Change-Id: I57e052998c48d76687b8973104386ee775b70e96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12 00:14:17 +00:00
Ankur Bakshi
0f5e3cb78b Update husky SVN to 13
Bug: 313797924
Change-Id: Ie36541e9b0c50d77f77802e0b67e9f99119aa7a8
2023-12-11 23:57:55 +00:00
Ankur Bakshi
c2af899c7b Update shiba SVN to 13
Bug: 313797924
Change-Id: Icba0028e5b0b47128946980e7f12af94c55943ac
2023-12-11 23:56:31 +00:00
Ankur Bakshi
19c1d74405 Merge "Update husky SVN to 12" into udc-qpr-dev 2023-12-11 23:39:30 +00:00
Xin Li
ec88118eb2 [automerger skipped] Merge Android 14 QPR1 am: ad5cc178e1 -s ours am: b398916a51 -s ours am: 51e3559f5c -s ours
am skip reason: Merged-In I3b4d08e3a3fd62a4887a518e9ad93294700693b3 with SHA-1 e2d2ed85ed is already in history

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

Change-Id: I56b8019b8ad770e46f82f11efcc1fb7f4284c55a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:57:37 +00:00
Xin Li
51e3559f5c [automerger skipped] Merge Android 14 QPR1 am: ad5cc178e1 -s ours am: b398916a51 -s ours
am skip reason: Merged-In I3b4d08e3a3fd62a4887a518e9ad93294700693b3 with SHA-1 e2d2ed85ed is already in history

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

Change-Id: I544a128c147939d3ade745110bf189c374036368
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:02:25 +00:00
Xin Li
b398916a51 [automerger skipped] Merge Android 14 QPR1 am: ad5cc178e1 -s ours
am skip reason: Merged-In I3b4d08e3a3fd62a4887a518e9ad93294700693b3 with SHA-1 e2d2ed85ed is already in history

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

Change-Id: Ib1368427030a68a3737fabec00f5884570de38e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 21:16:36 +00:00
Ankur Bakshi
f8afb5a508 Update husky SVN to 12
Bug: 313797924
Change-Id: Idd554ae7c2454854b8bba9c05876f7dc69a38f3e
2023-12-11 20:13:17 +00:00
Ankur Bakshi
2f87d29fbe Update shiba SVN to 12
Bug: 313797924
Change-Id: I47ff4790276c2e9dc8b4c3a211c8079d8a7d7414
2023-12-11 20:12:22 +00:00
George Chang
826cf6135d [NFC] Update sku id for shiba am: 66faa9c03a am: e42346cb41 am: 2009792bbb
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/2859065

Change-Id: Ia9ab7841847e8ab0c272dc91013b71f6b1a16c41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 19:53:28 +00:00
Roshan Pius
5f9ac43cb7 [automerger skipped] Merge "Revert "shusky(nfc): Modify NFC overlays for NFC apex"" into main am: 0750e5b918 am: 6678bbd076 am: 46c323e195 -s ours
am skip reason: Merged-In I08a0c9967cd5da77d59ef60627b793efcf2d8377 with SHA-1 d92852d647 is already in history

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

Change-Id: Ic0294dd6b29de78fb55ea411b5359db9baa42064
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 19:53:14 +00:00
Roshan Pius
db1f748ad9 [automerger skipped] Revert "shusky: Replace NFC app with NFC apex" am: 18ec58ff4d -s ours am: fb1f42b7c8 -s ours am: 0f9924bb74 -s ours
am skip reason: skipped by user rpius

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

Change-Id: Id172c0105d2608858b74e0c81271a6e5e8314e4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 19:53:10 +00:00
George Chang
2009792bbb [NFC] Update sku id for shiba am: 66faa9c03a am: e42346cb41
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/2859065

Change-Id: Ie1105aff9b643b9d8821036033fa823c33e0c50e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 19:24:17 +00:00
Roshan Pius
46c323e195 Merge "Revert "shusky(nfc): Modify NFC overlays for NFC apex"" into main am: 0750e5b918 am: 6678bbd076
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/2817311

Change-Id: Ie5956d248940b4c9d9dae77c4bd6721e219e15f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 19:24:07 +00:00
Roshan Pius
0f9924bb74 [automerger skipped] Revert "shusky: Replace NFC app with NFC apex" am: 18ec58ff4d -s ours am: fb1f42b7c8 -s ours
am skip reason: skipped by user rpius

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

Change-Id: Ie4855967d3fd5c04e64b383e70121843bcba6652
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 19:24:04 +00:00
George Chang
e42346cb41 [NFC] Update sku id for shiba am: 66faa9c03a
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/2859065

Change-Id: I64f46eaa8e5a8b7db691f720d6c7b216b47cedc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 18:51:02 +00:00
Roshan Pius
6678bbd076 Merge "Revert "shusky(nfc): Modify NFC overlays for NFC apex"" into main am: 0750e5b918
Original change: https://android-review.googlesource.com/c/device/google/shusky/+/2817311

Change-Id: I38b83146e5fd603ad2104d0f8ef438c23fd2172e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 18:50:50 +00:00
Roshan Pius
fb1f42b7c8 [automerger skipped] Revert "shusky: Replace NFC app with NFC apex" am: 18ec58ff4d -s ours
am skip reason: skipped by user rpius

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

Change-Id: I1cad326d9fd0a654a30a9fea67e12602bc443e7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 18:50:47 +00:00
Carter Hsu
145f10c929 audio: Update Fortemedia tuning
1. Optimize kid's voice parameter for HA NB/WB/SWB and HH WB/SWB
DR_RESRV_5: 0x0064
DR_RESRV_6: 0x1000
2. Apply HA/HH to TX co-use user cases: BT-HAC, Cust1, Cust2, Reserve1, Headphone, TTY-VCO

Bug: 315755480
Test: Verified by test build
Change-Id: Iced6eb56144bdb100fa0db64e11cba305da68b00
Signed-off-by: Carter Hsu <carterhsu@google.com>
2023-12-11 18:09:59 +08:00
Xin Li
ad5cc178e1 Merge Android 14 QPR1
Merged-In: I3b4d08e3a3fd62a4887a518e9ad93294700693b3
Bug: 315507370
Change-Id: Idac49a7a1c71b017efadae2ea3d58422e9b41093
2023-12-08 13:15:54 -08:00
Xin Li
808f4f5fca [automerger skipped] Merge UQ1A.231205.015 am: e2d2ed85ed -s ours am: dc1e99d2e4 -s ours
am skip reason: Merged-In I38bce6825ac29b93a6691cee6cca312be3db874e with SHA-1 6f2da6ead2 is already in history

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

Change-Id: Iee62255b74da8f20dc1f4d3c5fc4d0dbfcf229d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 08:51:03 +00:00
Xin Li
dc1e99d2e4 [automerger skipped] Merge UQ1A.231205.015 am: e2d2ed85ed -s ours
am skip reason: Merged-In I38bce6825ac29b93a6691cee6cca312be3db874e with SHA-1 6f2da6ead2 is already in history

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

Change-Id: I3b70dcb945156c63809469fecb1ae7f3aeae3bff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 08:21:16 +00:00
Xin Li
e2d2ed85ed Merge UQ1A.231205.015
Bug: 308969284
Merged-In: I38bce6825ac29b93a6691cee6cca312be3db874e
Change-Id: I3b4d08e3a3fd62a4887a518e9ad93294700693b3
2023-12-07 15:47:37 -08:00