diff options
author | Greg Kroah-Hartman <gregkh@google.com> | 2020-07-06 09:08:44 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@google.com> | 2020-07-06 17:17:02 +0200 |
commit | 6cb5e3536b662491a12c02f8b545ca2877e8eff5 (patch) | |
tree | 3648c5b25cc122e12ec561421671561066242859 | |
parent | c4b72ad25c232551a1d6658e419bc2ff56145a02 (diff) |
ANDROID: GKI: move abi files to android/ASB-2020-07-05_5.4
It's good to move the abi files out of the root kernel directory, so
move them to android/ to make it obvious these are add-on things, not
anything that is upstream.
Bug: 155573384
Cc: Matthias Maennich <maennich@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I9f6c2269a1c4e8e4233971adc805cb7584d455f9
-rw-r--r-- | android/abi_gki_aarch64 (renamed from abi_gki_aarch64) | 0 | ||||
-rw-r--r-- | android/abi_gki_aarch64.xml (renamed from abi_gki_aarch64.xml) | 0 | ||||
-rw-r--r-- | android/abi_gki_aarch64_android_internal (renamed from abi_gki_aarch64_android_internal) | 0 | ||||
-rw-r--r-- | android/abi_gki_aarch64_cuttlefish (renamed from abi_gki_aarch64_cuttlefish) | 0 | ||||
-rw-r--r-- | android/abi_gki_aarch64_db845c (renamed from abi_gki_aarch64_db845c) | 0 | ||||
-rw-r--r-- | android/abi_gki_aarch64_exynos (renamed from abi_gki_aarch64_exynos) | 0 | ||||
-rw-r--r-- | android/abi_gki_aarch64_goldfish (renamed from abi_gki_aarch64_goldfish) | 0 | ||||
-rw-r--r-- | android/abi_gki_aarch64_hikey960 (renamed from abi_gki_aarch64_hikey960) | 0 | ||||
-rw-r--r-- | android/abi_gki_aarch64_qcom (renamed from abi_gki_aarch64_qcom) | 0 | ||||
-rw-r--r-- | android/abi_gki_aarch64_sunxi (renamed from abi_gki_aarch64_sunxi) | 0 | ||||
-rw-r--r-- | android/abi_gki_aarch64_unisoc (renamed from abi_gki_aarch64_unisoc) | 0 | ||||
-rw-r--r-- | build.config.gki.aarch64 | 22 |
12 files changed, 11 insertions, 11 deletions
diff --git a/abi_gki_aarch64 b/android/abi_gki_aarch64 index f33265b5760a..f33265b5760a 100644 --- a/abi_gki_aarch64 +++ b/android/abi_gki_aarch64 diff --git a/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml index f2c57f84c75d..f2c57f84c75d 100644 --- a/abi_gki_aarch64.xml +++ b/android/abi_gki_aarch64.xml diff --git a/abi_gki_aarch64_android_internal b/android/abi_gki_aarch64_android_internal index 98c3485ec6cd..98c3485ec6cd 100644 --- a/abi_gki_aarch64_android_internal +++ b/android/abi_gki_aarch64_android_internal diff --git a/abi_gki_aarch64_cuttlefish b/android/abi_gki_aarch64_cuttlefish index 1eae45dc2b5b..1eae45dc2b5b 100644 --- a/abi_gki_aarch64_cuttlefish +++ b/android/abi_gki_aarch64_cuttlefish diff --git a/abi_gki_aarch64_db845c b/android/abi_gki_aarch64_db845c index 20253219ab09..20253219ab09 100644 --- a/abi_gki_aarch64_db845c +++ b/android/abi_gki_aarch64_db845c diff --git a/abi_gki_aarch64_exynos b/android/abi_gki_aarch64_exynos index cd064fc4deef..cd064fc4deef 100644 --- a/abi_gki_aarch64_exynos +++ b/android/abi_gki_aarch64_exynos diff --git a/abi_gki_aarch64_goldfish b/android/abi_gki_aarch64_goldfish index 79afa37d5586..79afa37d5586 100644 --- a/abi_gki_aarch64_goldfish +++ b/android/abi_gki_aarch64_goldfish diff --git a/abi_gki_aarch64_hikey960 b/android/abi_gki_aarch64_hikey960 index a954832e2351..a954832e2351 100644 --- a/abi_gki_aarch64_hikey960 +++ b/android/abi_gki_aarch64_hikey960 diff --git a/abi_gki_aarch64_qcom b/android/abi_gki_aarch64_qcom index fb579d4ddf9c..fb579d4ddf9c 100644 --- a/abi_gki_aarch64_qcom +++ b/android/abi_gki_aarch64_qcom diff --git a/abi_gki_aarch64_sunxi b/android/abi_gki_aarch64_sunxi index 448392e11848..448392e11848 100644 --- a/abi_gki_aarch64_sunxi +++ b/android/abi_gki_aarch64_sunxi diff --git a/abi_gki_aarch64_unisoc b/android/abi_gki_aarch64_unisoc index 7d5c03432ee1..7d5c03432ee1 100644 --- a/abi_gki_aarch64_unisoc +++ b/android/abi_gki_aarch64_unisoc diff --git a/build.config.gki.aarch64 b/build.config.gki.aarch64 index 753c37c321f9..4577dcb8dd75 100644 --- a/build.config.gki.aarch64 +++ b/build.config.gki.aarch64 @@ -2,18 +2,18 @@ . ${ROOT_DIR}/common/build.config.aarch64 . ${ROOT_DIR}/common/build.config.gki -ABI_DEFINITION=abi_gki_aarch64.xml -KMI_WHITELIST=abi_gki_aarch64 +ABI_DEFINITION=android/abi_gki_aarch64.xml +KMI_WHITELIST=android/abi_gki_aarch64 ADDITIONAL_KMI_WHITELISTS=" -abi_gki_aarch64_cuttlefish -abi_gki_aarch64_db845c -abi_gki_aarch64_goldfish -abi_gki_aarch64_hikey960 -abi_gki_aarch64_qcom -abi_gki_aarch64_unisoc -abi_gki_aarch64_exynos -abi_gki_aarch64_sunxi -abi_gki_aarch64_android_internal +android/abi_gki_aarch64_cuttlefish +android/abi_gki_aarch64_db845c +android/abi_gki_aarch64_goldfish +android/abi_gki_aarch64_hikey960 +android/abi_gki_aarch64_qcom +android/abi_gki_aarch64_unisoc +android/abi_gki_aarch64_exynos +android/abi_gki_aarch64_sunxi +android/abi_gki_aarch64_android_internal " TRIM_NONLISTED_KMI=1 KMI_WHITELIST_STRICT_MODE=1 |