Commit graph

2302 commits

Author SHA1 Message Date
Xin Li
27bb5095f0 Merge Android 24Q2 Release (ab/11526283) to aosp-main-future
Bug: 337098550
Merged-In: I37f298490ca51d8d6a7e24e48b50b84200ed77ee
Change-Id: Iec31df1703cee93e636417402671099825b43af0
2024-05-06 12:09:28 -07:00
Neill Kapron
5213a02e76 Revert "GKI: V: Add Android USB config requirements" am: 7de932a4b9
Original change: https://android-review.googlesource.com/c/kernel/configs/+/3004279

Change-Id: I32d8c3f1cccb646eebf1c12735ed06aa1b232cd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-15 21:29:02 +00:00
Neill Kapron
7de932a4b9 Revert "GKI: V: Add Android USB config requirements"
This reverts commit 01ced15340.

Reason for revert: Breaks AOSP platform CF build, need to update kernel prebuilts first.

Change-Id: I1b5698d0280091fc86a222619779b7917ffd7e6e
2024-03-15 21:02:37 +00:00
Neill Kapron
e1b9bd8d6d GKI: V: Add Android USB config requirements am: 01ced15340
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2994880

Change-Id: Ic6e650b1bac89c314f4755fd0a6d13e9790f0fc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-15 16:21:28 +00:00
Neill Kapron
01ced15340 GKI: V: Add Android USB config requirements
This adds the following Android USB related config options to the
required list for both V kernels.

CONFIG_ANDROID_USB_CONFIGFS_UEVENT
CONFIG_ANDROID_USB_F_MIDI_INFO
CONFIG_ANDROID_USB_CONFIGFS_F_ACC

Bug: 120441124
Bug: 317149848

Change-Id: I11040784dc605376a28f311bf440d525b4c26d56
Signed-off-by: Neill Kapron <nkapron@google.com>
2024-03-08 21:05:57 +00:00
Devin Moore
329c8408af Merge "Vendor API level 202404 is now frozen" into main am: be625f2ccf
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2989510

Change-Id: I06833121369ee5428dc6c2838783b68e54af7c6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-08 18:55:43 +00:00
Devin Moore
be625f2ccf Merge "Vendor API level 202404 is now frozen" into main 2024-03-07 23:57:36 +00:00
Devin Moore
31d6ead88e Vendor API level 202404 is now frozen
Merged-In: I37f298490ca51d8d6a7e24e48b50b84200ed77ee
Bug: 279809333
Test: build
Change-Id: I37f298490ca51d8d6a7e24e48b50b84200ed77ee
2024-03-06 21:33:24 +00:00
Devin Moore
d82be2bfc5 Vendor API level 202404 is now frozen
Ignore-AOSP-First: VINTF 202404 Finalization

Bug: 279809333
Test: build
Change-Id: I37f298490ca51d8d6a7e24e48b50b84200ed77ee
2024-02-28 17:37:58 +00:00
Sami Tolvanen
29fa6d85a6 v: 6.x: Update to match VSR 3.4.6 kernel security requirements am: 68f8667029 am: fefe369085
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2930436

Change-Id: Icac050ef45ab2a73780fc9a4a2183197db0c51cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-16 01:18:27 +00:00
Sami Tolvanen
fefe369085 v: 6.x: Update to match VSR 3.4.6 kernel security requirements am: 68f8667029
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2930436

Change-Id: I7c4f59defdacf6b2c8dc53bc4c87a4232fd5548a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-16 00:38:57 +00:00
Sami Tolvanen
68f8667029 v: 6.x: Update to match VSR 3.4.6 kernel security requirements
Require CONFIG_CFI_CLANG on arm64 and x86_64. Note that CONFIG_SHADOW_CALL_STACK
is already required on arm64, and CONFIG_RANDOMIZE_BASE is required on arm64 and
x86, so no changes are needed for SCS/KASLR.

Bug: 295216321
Bug: 314198880
Test: presubmit
Change-Id: Ib8981ac14384c7c9afa6634322dc8382450dd951
2024-02-15 21:07:58 +00:00
Devin Moore
38559a9d74 Reapply "Remove Android Q kernel configs" am: 3610907a2b am: 2221347247
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2932946

Change-Id: I27ebbf08c7b3b319f74f61b5af85f98f00b6b9f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-01 22:26:01 +00:00
Devin Moore
2221347247 Reapply "Remove Android Q kernel configs" am: 3610907a2b
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2932946

Change-Id: I46511b09935c7242de93a8162f5e4f8f998e2f7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-01 21:42:35 +00:00
Devin Moore
3610907a2b Reapply "Remove Android Q kernel configs"
Re-land chang after fixing downstream devices

This reverts commit 0606f4897c.

Test: m
Bug: 279809679
Change-Id: I6814e446de2208dc18bd3730007d2b5617d2d546
2024-01-29 21:46:14 +00:00
Treehugger Robot
d2c2bb3058 Merge "GKI: V: Remove USB NET kernel config requirements" into main am: 75b13339a5 am: cdbe8f150d
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2918205

Change-Id: I9081aaa4aad6594d862b46390477b33dfe615114
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-19 01:11:09 +00:00
Treehugger Robot
c7d2f93349 Merge "V: Drop USB gadget config for uevent and accessory from base" into main am: a97985d801 am: cd870bd623
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2918474

Change-Id: I4fdc325f854956e2e19d957bee2b7178b505d154
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-19 01:10:45 +00:00
Will McVicker
a789d47d9e v: 6.6: Replace DEBUG_LIST with BUG_ON_DATA_CORRUPTION am: 7ff2d09291 am: 9cf4b0fd2e
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2917905

Change-Id: I18f60e2dec2d5fb2ccdde279feb864924dac2c42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-19 01:10:37 +00:00
Will McVicker
4022b0041b v: drop CONFIG_USB_CONFIGFS_F_AUDIO_SRC am: 1b08793d1d am: 77ac5174b0
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2911921

Change-Id: I50eec7d134835aab5612abaf3fa486d515b1fb7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-19 01:10:28 +00:00
Treehugger Robot
cdbe8f150d Merge "GKI: V: Remove USB NET kernel config requirements" into main am: 75b13339a5
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2918205

Change-Id: I3990ebb9fe822074447affb70a13fcd2c1bbb2f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-19 00:28:06 +00:00
Treehugger Robot
cd870bd623 Merge "V: Drop USB gadget config for uevent and accessory from base" into main am: a97985d801
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2918474

Change-Id: I97f6d56ec4e0cd50e71f885879fb226c0c184220
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-19 00:27:56 +00:00
Will McVicker
9cf4b0fd2e v: 6.6: Replace DEBUG_LIST with BUG_ON_DATA_CORRUPTION am: 7ff2d09291
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2917905

Change-Id: I880f9bb5a03268f1ba791180858fb0ee10b30c65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-19 00:27:34 +00:00
Will McVicker
77ac5174b0 v: drop CONFIG_USB_CONFIGFS_F_AUDIO_SRC am: 1b08793d1d
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2911921

Change-Id: I4f1f388b0fedf362e57ab718c14fb4227f9bb233
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-19 00:25:43 +00:00
Treehugger Robot
75b13339a5 Merge "GKI: V: Remove USB NET kernel config requirements" into main 2024-01-19 00:03:32 +00:00
Treehugger Robot
a97985d801 Merge "V: Drop USB gadget config for uevent and accessory from base" into main 2024-01-19 00:01:33 +00:00
Ramji Jiyani
f4eac53537 GKI: V: Remove USB NET kernel config requirements
Remove these kernel configs from the android-base.config
as these are converted to GKI modules for android14-* and
later kernels.

CONFIG_USB_NET_AQC111
CONFIG_USB_NET_CDC_NCM

Cherry-pick: 79ecc82 ("GKI: U: Remove USB NET kernel config
requirements")
Bug: 321046447
Test: TH
Change-Id: I7d9522cefb18a2d44444b69108abf927bf7e9cc9
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
2024-01-18 23:17:47 +00:00
Ramji Jiyani
c4f8f0f47d V: Drop USB gadget config for uevent and accessory from base
Removes these configs from the base config for Android V:

CONFIG_USB_CONFIGFS_F_ACC
CONFIG_USB_CONFIGFS_UEVENT

a133079a74e8 ("ANDROID: GKI: revert all external USB/sound changes")
reverted these functions from android15-6.1. There is work in progress
to implement these fucntions correctly and being tracked in
http://b/120441124

This will unblock the Android V build errors reporting them missing.

Bug: 321046447
Bug: 120441124
Test: TH
Change-Id: Ic7c9d9a6815fbca1bdcb740871f89c84960a5b31
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
2024-01-18 23:17:08 +00:00
Will McVicker
7ff2d09291 v: 6.6: Replace DEBUG_LIST with BUG_ON_DATA_CORRUPTION
...which selects LIST_HARDENED. This is enough to catch list corruption
issues that would allow for some classic exploitation primitives without
regressing performance. Refer to [1] for throughput perf data when only
selecting LIST_HARDENED over DEBUG_LIST.

[1] https://lore.kernel.org/all/20230811151847.1594958-3-elver@google.com/

Bug: 311450232
Change-Id: I5069b338e8988aba9fd650a9828d2cb0625f971f
Signed-off-by: Will McVicker <willmcvicker@google.com>
2024-01-18 10:42:31 -08:00
Will McVicker
1b08793d1d v: drop CONFIG_USB_CONFIGFS_F_AUDIO_SRC
This feature was deprecated in Android 8.0 [1]. So remove it from the
required vintf configs.

[1] https://source.android.com/docs/core/interaction/accessories/aoa2#audio-support

Bug: 120441124
Change-Id: Icec70123cf5166181292207920410c657aa57cf5
Signed-off-by: Will McVicker <willmcvicker@google.com>
2024-01-18 10:35:11 -08:00
Todd Kjos
4057a85c87 Merge "Update v/android-6.6 based on changes since 6.1" into main am: a5e41d29a0 am: 786dab5f2f am: 2fb6c4f2c6
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2861073

Change-Id: I8b430024c05959328338ae01d94e1a28ae855bba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 22:57:39 +00:00
Todd Kjos
2fb6c4f2c6 Merge "Update v/android-6.6 based on changes since 6.1" into main am: a5e41d29a0 am: 786dab5f2f
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2861073

Change-Id: Ief512943b65937d261763f111b56c148586b34da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 22:23:44 +00:00
Todd Kjos
e28fd90b64 Merge "Update v/android-6.6 based on changes since 6.1" into main am: a5e41d29a0 am: 0ef6dbbe6c am: 92d199eeb6
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2861073

Change-Id: I75f5fa8ef3f165754a105cab73f3752c021d959a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 22:07:51 +00:00
Todd Kjos
92d199eeb6 Merge "Update v/android-6.6 based on changes since 6.1" into main am: a5e41d29a0 am: 0ef6dbbe6c
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2861073

Change-Id: I9b45f294114466030c82a4583ff4f8211bf45496
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 21:34:13 +00:00
Todd Kjos
0ef6dbbe6c Merge "Update v/android-6.6 based on changes since 6.1" into main am: a5e41d29a0
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2861073

Change-Id: Ic1fd8b405d3d07dd957607c6b8488618c735caf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 21:02:36 +00:00
Todd Kjos
786dab5f2f Merge "Update v/android-6.6 based on changes since 6.1" into main am: a5e41d29a0
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2861073

Change-Id: I021223ea499333852b94c1566970502f8d62af26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 20:58:33 +00:00
Todd Kjos
a5e41d29a0 Merge "Update v/android-6.6 based on changes since 6.1" into main 2023-12-06 20:15:01 +00:00
Devin Moore
8f4782720a Remove binder device config requirement am: 8c70330d6d am: 58019d0d07 am: 84b7833751
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2861066

Change-Id: Id0f01dd3ce75401a3a75e15b62cd90651aae0fee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 19:17:43 +00:00
Devin Moore
191025d9ad Remove binder device config requirement am: 8c70330d6d am: 4265e24467 am: 3fb54aadef
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2861066

Change-Id: I8e4e497fd088a4cc1510faf64075fcfa569d3501
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 19:15:24 +00:00
Devin Moore
84b7833751 Remove binder device config requirement am: 8c70330d6d am: 58019d0d07
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2861066

Change-Id: I2dd3ac70e15b15881f682dbc36bee188c21f3226
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 18:43:50 +00:00
Devin Moore
3fb54aadef Remove binder device config requirement am: 8c70330d6d am: 4265e24467
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2861066

Change-Id: I122cf38499e50846a207a3d967688cef8f0ea7e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 18:43:06 +00:00
Devin Moore
58019d0d07 Remove binder device config requirement am: 8c70330d6d
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2861066

Change-Id: Ie2fdcc17f1dfb5e26c11bed303426cc7534028f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 17:56:12 +00:00
Devin Moore
4265e24467 Remove binder device config requirement am: 8c70330d6d
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2861066

Change-Id: Ie5896c900bc2cd3aae63c913ee04ad6d6e281da2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 17:28:49 +00:00
Will McVicker
2cc1e530a2 Update v/android-6.6 based on changes since 6.1
* Drop CONFIG_USB_NET_AQ111 and CONFIG_USB_NET_CDC_NCM since these are
  GKI modules now
* Replace CONFIG_EMBEDDED with CONFIG_EXPERT due to commit ef815d2cba78
  ("treewide: drop CONFIG_EMBEDDED")

Bug: 311450232
Signed-off-by: Will McVicker <willmcvicker@google.com>
Change-Id: Ia33e9f64d7cdaa1677ee7d7fa0dd6659c9ff5b09
2023-12-06 01:03:16 +00:00
Devin Moore
8c70330d6d Remove binder device config requirement
/dev/vndbinder shouldn't be required because vndbinder/vndservicemanager
has been deprecated (optional).
https://source.android.com/docs/core/architecture/hidl/binder-ipc#vndbinder

/dev/hwbinder is no longer required because HIDL is being deprecated and
devices can soon be released without hwservicemanager.

Test: atest vts_treble_vintf_framework_test
Bug: 296459107
Change-Id: I67f3b76c8213877ee1d57ab5623a018cda3726a2
2023-12-06 00:04:27 +00:00
William McVicker
b3cbe609a0 Create v/android-6.6 based off of v/6.1 am: ec7e744031 am: a27e830113 am: d6c639e9ac
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2855350

Change-Id: I5fe01bc4aacc1abdca1f4bb7f4f65b04c12710d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04 20:00:07 +00:00
William McVicker
7707f55458 Create v/android-6.6 based off of v/6.1 am: ec7e744031 am: a58b23d148 am: ae02008d75
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2855350

Change-Id: I4617dd336d6c3ecb941543419fd1590107bf805d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04 19:58:31 +00:00
William McVicker
d6c639e9ac Create v/android-6.6 based off of v/6.1 am: ec7e744031 am: a27e830113
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2855350

Change-Id: I694fe543edfed435ebca6f2eb59a168afa24d71a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04 19:33:28 +00:00
William McVicker
ae02008d75 Create v/android-6.6 based off of v/6.1 am: ec7e744031 am: a58b23d148
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2855350

Change-Id: I603a6ae0ce8314da792f6abc5e7345aed16950ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04 19:32:42 +00:00
William McVicker
a58b23d148 Create v/android-6.6 based off of v/6.1 am: ec7e744031
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2855350

Change-Id: I2c41256a442c85339e7a5ddc96155eb65405a5ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04 18:56:23 +00:00
William McVicker
a27e830113 Create v/android-6.6 based off of v/6.1 am: ec7e744031
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2855350

Change-Id: I720e8e9072decc75a1ab99f6be1a91a3a3b27697
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04 18:44:37 +00:00