diff --git a/README.md b/README.md index d0e9453..21e300f 100644 --- a/README.md +++ b/README.md @@ -157,23 +157,6 @@ Build rules from the aforementioned files to a [this link](https://source.android.com/devices/architecture/vintf/match-rules#kernel) for details of the output format. -## I want to freeze/release the current kernel requirements. What do I do? - -Prior to a [FCM Version release](https://source.android.com/devices/architecture/vintf/fcm#new-fcm-versions) -(often accompanied with a dessert release as well), the kernel requirements must -be frozen. Follow the following steps - -* Copy the top-level `android-*` directories to a release directory, preferably - with the dessert name (for example, `q`). - * Remove top-level `android-*` directories. This change is not propagated to - master. -* Edit the new `/android-*/Android.bp` files and rename the modules. - For example, change `kernel_config_current_4.9` in `q/android-4.9/Android.bp` - to `kernel_config_q_4.9` -* Under `hardware/interfaces/compatibility_matrices/Android.bp`, edit - `kernel_configs` field for the `framework_compatibility_matrix..xml` - to use the new modules. - ## I want to edit a released kernel requirement. What do I do? Don't edit a released kernel requirement unless necessary. If you have to make diff --git a/android-5.15/Android.bp b/v/android-5.15/Android.bp similarity index 95% rename from android-5.15/Android.bp rename to v/android-5.15/Android.bp index 20bfc0f..c71f5b7 100644 --- a/android-5.15/Android.bp +++ b/v/android-5.15/Android.bp @@ -18,7 +18,7 @@ package { } kernel_config { - name: "kernel_config_current_5.15", + name: "kernel_config_v_5.15", srcs: [ "android-base.config", ], diff --git a/android-5.15/android-base-conditional.xml b/v/android-5.15/android-base-conditional.xml similarity index 100% rename from android-5.15/android-base-conditional.xml rename to v/android-5.15/android-base-conditional.xml diff --git a/android-5.15/android-base.config b/v/android-5.15/android-base.config similarity index 100% rename from android-5.15/android-base.config rename to v/android-5.15/android-base.config diff --git a/android-6.1/Android.bp b/v/android-6.1/Android.bp similarity index 95% rename from android-6.1/Android.bp rename to v/android-6.1/Android.bp index 91be649..8e00d84 100644 --- a/android-6.1/Android.bp +++ b/v/android-6.1/Android.bp @@ -18,7 +18,7 @@ package { } kernel_config { - name: "kernel_config_current_6.1", + name: "kernel_config_v_6.1", srcs: [ "android-base.config", ], diff --git a/android-6.1/android-base-conditional.xml b/v/android-6.1/android-base-conditional.xml similarity index 100% rename from android-6.1/android-base-conditional.xml rename to v/android-6.1/android-base-conditional.xml diff --git a/android-6.1/android-base.config b/v/android-6.1/android-base.config similarity index 100% rename from android-6.1/android-base.config rename to v/android-6.1/android-base.config