commit 8555f0d9d303de5d961ef404488109f7a2389567
author Quentin Perret <qperret@google.com> Mon Jul 13 18:39:28 2020 +0100
committer Quentin Perret <qperret@google.com> Thu Aug 06 09:40:34 2020 +0100
tree 2f68e84b116288709a010aa0c1ece957731d1831
parent 87915c1e4624860ea81268e87e3b3e1a56733535

ANDROID: Remove abi_gki_aarch64_android_internal

Remove abi_gki_aarch64_android_internal and let's move all the
GKI-modules symbols to the 'core' abi_gki_aarch64 file. KMI_SYMBOL_LIST
is pointing at it in the GKI build.config files, so the GKI symbol list
can be updated like any other:

BUILD_CONFIG=common/build.config.gki.aarch64 ./build/build_abi.sh --update

The other build targets (db845c and h960) have a different
KMI_SYMBOL_LIST and ignore GKI modules, which should avoid any overlaps.

Bug: 158048250
Signed-off-by: Quentin Perret <qperret@google.com>
Change-Id: I63c45d6501a86814ae6c9e470c7b0879e54bb173

android/abi_gki_aarch64

diff --git a/android/abi_gki_aarch64 b/android/abi_gki_aarch64
index f33265b..de3dd25 100644
--- a/android/abi_gki_aarch64
+++ b/android/abi_gki_aarch64
@@ -3,6 +3,10 @@
   module_layout
   __put_task_struct
 
+# Below are symbols for Android GKI "internal" modules that will not be exported
+# for "external" modules in the future, but for now we need to keep track of
+# them until that framework is in place.
+
 # required by erofs.ko
   add_to_page_cache_lru
   __alloc_pages_nodemask

android/abi_gki_aarch64_android_internal

diff --git a/android/abi_gki_aarch64_android_internal b/android/abi_gki_aarch64_android_internal
deleted file mode 100644
index 98c3485..0000000
--- a/android/abi_gki_aarch64_android_internal
+++ /dev/null
@@ -1,20 +0,0 @@
-[abi_whitelist]
-# symbols for Android GKI "internal" modules that will not be exported for
-# "external" modules in the future, but for now we need to keep track of them
-# until that framework is in place.
-
-# erofs.ko
-  LZ4_decompress_safe_partial
-  add_to_page_cache_lru
-  bit_wait
-  fs_ftype_to_dtype
-  init_user_ns
-  out_of_line_wait_on_bit_lock
-  posix_acl_access_xattr_handler
-  posix_acl_default_xattr_handler
-  posix_acl_from_xattr
-  put_pages_list
-  radix_tree_preload
-  read_cache_page_gfp
-  simple_get_link
-  vm_unmap_aliases

build.config.gki.aarch64

diff --git a/build.config.gki.aarch64 b/build.config.gki.aarch64
index 8394bce..b557aa9 100644
--- a/build.config.gki.aarch64
+++ b/build.config.gki.aarch64
@@ -13,7 +13,6 @@
 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_SYMBOL_LIST_STRICT_MODE=1