From d298b222cd37f51c8f34762197cd60c0594bf08d Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Fri, 20 Mar 2020 18:38:21 -0700 Subject: [PATCH] Freeze kernel configs for r. Bug: 151966896 Test: builds Change-Id: I54c4338726fe1c533fae63a8509e23bf4ea7abbc --- {android-5.4 => r/android-4.14}/Android.bp | 4 ++-- {android-4.14 => r/android-4.14}/android-base-conditional.xml | 0 {android-4.14 => r/android-4.14}/android-base.config | 0 .../android-4.14}/android-recommended-arm.config | 0 .../android-4.14}/android-recommended-arm64.config | 0 .../android-4.14}/android-recommended-x86.config | 0 {android-4.14 => r/android-4.14}/android-recommended.config | 0 {android-4.14 => r/android-4.19}/Android.bp | 4 ++-- {android-4.19 => r/android-4.19}/android-base-conditional.xml | 0 {android-4.19 => r/android-4.19}/android-base.config | 0 .../android-4.19}/android-recommended-arm.config | 0 .../android-4.19}/android-recommended-arm64.config | 0 .../android-4.19}/android-recommended-x86.config | 0 {android-4.19 => r/android-4.19}/android-recommended.config | 0 {android-4.19 => r/android-5.4}/Android.bp | 4 ++-- {android-5.4 => r/android-5.4}/android-base-conditional.xml | 0 {android-5.4 => r/android-5.4}/android-base.config | 0 {android-5.4 => r/android-5.4}/android-recommended-arm.config | 0 .../android-5.4}/android-recommended-arm64.config | 0 {android-5.4 => r/android-5.4}/android-recommended-x86.config | 0 {android-5.4 => r/android-5.4}/android-recommended.config | 0 21 files changed, 6 insertions(+), 6 deletions(-) rename {android-5.4 => r/android-4.14}/Android.bp (87%) rename {android-4.14 => r/android-4.14}/android-base-conditional.xml (100%) rename {android-4.14 => r/android-4.14}/android-base.config (100%) rename {android-4.14 => r/android-4.14}/android-recommended-arm.config (100%) rename {android-4.14 => r/android-4.14}/android-recommended-arm64.config (100%) rename {android-4.14 => r/android-4.14}/android-recommended-x86.config (100%) rename {android-4.14 => r/android-4.14}/android-recommended.config (100%) rename {android-4.14 => r/android-4.19}/Android.bp (87%) rename {android-4.19 => r/android-4.19}/android-base-conditional.xml (100%) rename {android-4.19 => r/android-4.19}/android-base.config (100%) rename {android-4.19 => r/android-4.19}/android-recommended-arm.config (100%) rename {android-4.19 => r/android-4.19}/android-recommended-arm64.config (100%) rename {android-4.19 => r/android-4.19}/android-recommended-x86.config (100%) rename {android-4.19 => r/android-4.19}/android-recommended.config (100%) rename {android-4.19 => r/android-5.4}/Android.bp (87%) rename {android-5.4 => r/android-5.4}/android-base-conditional.xml (100%) rename {android-5.4 => r/android-5.4}/android-base.config (100%) rename {android-5.4 => r/android-5.4}/android-recommended-arm.config (100%) rename {android-5.4 => r/android-5.4}/android-recommended-arm64.config (100%) rename {android-5.4 => r/android-5.4}/android-recommended-x86.config (100%) rename {android-5.4 => r/android-5.4}/android-recommended.config (100%) diff --git a/android-5.4/Android.bp b/r/android-4.14/Android.bp similarity index 87% rename from android-5.4/Android.bp rename to r/android-4.14/Android.bp index 1e1ad02..a837efa 100644 --- a/android-5.4/Android.bp +++ b/r/android-4.14/Android.bp @@ -1,4 +1,4 @@ -// Copyright (C) 2018 The Android Open Source Project +// Copyright (C) 2020 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. @@ -13,7 +13,7 @@ // limitations under the License. kernel_config { - name: "kernel_config_current_5.4", + name: "kernel_config_r_4.14", srcs: [ "android-base.config", ], diff --git a/android-4.14/android-base-conditional.xml b/r/android-4.14/android-base-conditional.xml similarity index 100% rename from android-4.14/android-base-conditional.xml rename to r/android-4.14/android-base-conditional.xml diff --git a/android-4.14/android-base.config b/r/android-4.14/android-base.config similarity index 100% rename from android-4.14/android-base.config rename to r/android-4.14/android-base.config diff --git a/android-4.14/android-recommended-arm.config b/r/android-4.14/android-recommended-arm.config similarity index 100% rename from android-4.14/android-recommended-arm.config rename to r/android-4.14/android-recommended-arm.config diff --git a/android-4.14/android-recommended-arm64.config b/r/android-4.14/android-recommended-arm64.config similarity index 100% rename from android-4.14/android-recommended-arm64.config rename to r/android-4.14/android-recommended-arm64.config diff --git a/android-4.14/android-recommended-x86.config b/r/android-4.14/android-recommended-x86.config similarity index 100% rename from android-4.14/android-recommended-x86.config rename to r/android-4.14/android-recommended-x86.config diff --git a/android-4.14/android-recommended.config b/r/android-4.14/android-recommended.config similarity index 100% rename from android-4.14/android-recommended.config rename to r/android-4.14/android-recommended.config diff --git a/android-4.14/Android.bp b/r/android-4.19/Android.bp similarity index 87% rename from android-4.14/Android.bp rename to r/android-4.19/Android.bp index 44679e8..b56987d 100644 --- a/android-4.14/Android.bp +++ b/r/android-4.19/Android.bp @@ -1,4 +1,4 @@ -// Copyright (C) 2018 The Android Open Source Project +// Copyright (C) 2020 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. @@ -13,7 +13,7 @@ // limitations under the License. kernel_config { - name: "kernel_config_current_4.14", + name: "kernel_config_r_4.19", srcs: [ "android-base.config", ], diff --git a/android-4.19/android-base-conditional.xml b/r/android-4.19/android-base-conditional.xml similarity index 100% rename from android-4.19/android-base-conditional.xml rename to r/android-4.19/android-base-conditional.xml diff --git a/android-4.19/android-base.config b/r/android-4.19/android-base.config similarity index 100% rename from android-4.19/android-base.config rename to r/android-4.19/android-base.config diff --git a/android-4.19/android-recommended-arm.config b/r/android-4.19/android-recommended-arm.config similarity index 100% rename from android-4.19/android-recommended-arm.config rename to r/android-4.19/android-recommended-arm.config diff --git a/android-4.19/android-recommended-arm64.config b/r/android-4.19/android-recommended-arm64.config similarity index 100% rename from android-4.19/android-recommended-arm64.config rename to r/android-4.19/android-recommended-arm64.config diff --git a/android-4.19/android-recommended-x86.config b/r/android-4.19/android-recommended-x86.config similarity index 100% rename from android-4.19/android-recommended-x86.config rename to r/android-4.19/android-recommended-x86.config diff --git a/android-4.19/android-recommended.config b/r/android-4.19/android-recommended.config similarity index 100% rename from android-4.19/android-recommended.config rename to r/android-4.19/android-recommended.config diff --git a/android-4.19/Android.bp b/r/android-5.4/Android.bp similarity index 87% rename from android-4.19/Android.bp rename to r/android-5.4/Android.bp index 1234860..66a0903 100644 --- a/android-4.19/Android.bp +++ b/r/android-5.4/Android.bp @@ -1,4 +1,4 @@ -// Copyright (C) 2018 The Android Open Source Project +// Copyright (C) 2020 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. @@ -13,7 +13,7 @@ // limitations under the License. kernel_config { - name: "kernel_config_current_4.19", + name: "kernel_config_r_5.4", srcs: [ "android-base.config", ], diff --git a/android-5.4/android-base-conditional.xml b/r/android-5.4/android-base-conditional.xml similarity index 100% rename from android-5.4/android-base-conditional.xml rename to r/android-5.4/android-base-conditional.xml diff --git a/android-5.4/android-base.config b/r/android-5.4/android-base.config similarity index 100% rename from android-5.4/android-base.config rename to r/android-5.4/android-base.config diff --git a/android-5.4/android-recommended-arm.config b/r/android-5.4/android-recommended-arm.config similarity index 100% rename from android-5.4/android-recommended-arm.config rename to r/android-5.4/android-recommended-arm.config diff --git a/android-5.4/android-recommended-arm64.config b/r/android-5.4/android-recommended-arm64.config similarity index 100% rename from android-5.4/android-recommended-arm64.config rename to r/android-5.4/android-recommended-arm64.config diff --git a/android-5.4/android-recommended-x86.config b/r/android-5.4/android-recommended-x86.config similarity index 100% rename from android-5.4/android-recommended-x86.config rename to r/android-5.4/android-recommended-x86.config diff --git a/android-5.4/android-recommended.config b/r/android-5.4/android-recommended.config similarity index 100% rename from android-5.4/android-recommended.config rename to r/android-5.4/android-recommended.config