diff options
author | William McVicker <willmcvicker@google.com> | 2023-12-04 18:44:37 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-04 18:44:37 +0000 |
commit | a27e8301130ed85861f8f1aa0572bf2a01c18f63 (patch) | |
tree | 19887e3aaaea5d38f2aef30432a759cc8fc480b7 | |
parent | ab2e4467c2347fc5f6bc9d1f0347e60353a93778 (diff) | |
parent | ec7e744031f74675e8816535b6b36f7ef7830efd (diff) | |
download | configs-a27e8301130ed85861f8f1aa0572bf2a01c18f63.tar.gz |
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>
-rw-r--r-- | v/android-6.6/Android.bp (renamed from v/android-5.15/Android.bp) | 6 | ||||
-rw-r--r-- | v/android-6.6/android-base-conditional.xml (renamed from v/android-5.15/android-base-conditional.xml) | 2 | ||||
-rw-r--r-- | v/android-6.6/android-base.config (renamed from v/android-5.15/android-base.config) | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/v/android-5.15/Android.bp b/v/android-6.6/Android.bp index c71f5b7..798e78a 100644 --- a/v/android-5.15/Android.bp +++ b/v/android-6.6/Android.bp @@ -1,4 +1,4 @@ -// Copyright (C) 2018 The Android Open Source Project +// Copyright (C) 2023 The Android Open Source Project // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -18,9 +18,9 @@ package { } kernel_config { - name: "kernel_config_v_5.15", + name: "kernel_config_v_6.6", srcs: [ "android-base.config", ], meta: "android-base-conditional.xml", -} +}
\ No newline at end of file diff --git a/v/android-5.15/android-base-conditional.xml b/v/android-6.6/android-base-conditional.xml index 11d3d95..d049e81 100644 --- a/v/android-5.15/android-base-conditional.xml +++ b/v/android-6.6/android-base-conditional.xml @@ -1,4 +1,4 @@ -<kernel minlts="5.15.0" /> +<kernel minlts="6.6.0" /> <!-- KEEP ALPHABETICALLY SORTED --> <!-- ARM base requirements --> diff --git a/v/android-5.15/android-base.config b/v/android-6.6/android-base.config index 0b099b3..90edb74 100644 --- a/v/android-5.15/android-base.config +++ b/v/android-6.6/android-base.config @@ -15,7 +15,6 @@ # CONFIG_USELIB is not set CONFIG_ADVISE_SYSCALLS=y CONFIG_AIO=y -CONFIG_ANDROID=y CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder" CONFIG_ANDROID_BINDER_IPC=y CONFIG_ANDROID_BINDERFS=y @@ -263,4 +262,4 @@ CONFIG_VETH=y CONFIG_XFRM_INTERFACE=y CONFIG_XFRM_MIGRATE=y CONFIG_XFRM_STATISTICS=y -CONFIG_XFRM_USER=y +CONFIG_XFRM_USER=y
\ No newline at end of file |