From 9b9b8c51cc5a7e3e7f2287e8a84457409d10638b Mon Sep 17 00:00:00 2001
From: Dimitry Ivanov <dimitry@google.com>
Date: Thu, 17 Dec 2015 21:33:07 -0800
Subject: [PATCH] Cleanup libc symbols for other architectures

Bug: http://b/26236057
Change-Id: I3c2f9a05490897fd5fb2fa2e5d765a6fdb9517f7
---
 .../android-21/arch-arm64/symbols/libc.so.functions.txt         | 2 --
 .../android-21/arch-mips/symbols/libc.so.functions.txt          | 2 --
 .../android-21/arch-mips64/symbols/libc.so.functions.txt        | 2 --
 ndk/platforms/android-21/arch-x86/symbols/libc.so.variables.txt | 1 -
 .../android-21/arch-x86_64/symbols/libc.so.functions.txt        | 2 --
 5 files changed, 9 deletions(-)

diff --git a/ndk/platforms/android-21/arch-arm64/symbols/libc.so.functions.txt b/ndk/platforms/android-21/arch-arm64/symbols/libc.so.functions.txt
index ed47c332c..a08268eb0 100644
--- a/ndk/platforms/android-21/arch-arm64/symbols/libc.so.functions.txt
+++ b/ndk/platforms/android-21/arch-arm64/symbols/libc.so.functions.txt
@@ -58,7 +58,6 @@ __p_time
 __p_type
 __pthread_cleanup_pop
 __pthread_cleanup_push
-__pthread_gettid
 __putlong
 __putshort
 __read_chk
@@ -206,7 +205,6 @@ dup2
 dup3
 duplocale
 endmntent
-endpwent
 endservent
 endutent
 epoll_create
diff --git a/ndk/platforms/android-21/arch-mips/symbols/libc.so.functions.txt b/ndk/platforms/android-21/arch-mips/symbols/libc.so.functions.txt
index e7badff90..bae4299c9 100644
--- a/ndk/platforms/android-21/arch-mips/symbols/libc.so.functions.txt
+++ b/ndk/platforms/android-21/arch-mips/symbols/libc.so.functions.txt
@@ -179,8 +179,6 @@ _flush_cache
 _getlong
 _getshort
 _longjmp
-_memset16
-_memset32
 _resolv_delete_cache_for_net
 _resolv_flush_cache_for_net
 _resolv_set_nameservers_for_net
diff --git a/ndk/platforms/android-21/arch-mips64/symbols/libc.so.functions.txt b/ndk/platforms/android-21/arch-mips64/symbols/libc.so.functions.txt
index ed47c332c..a08268eb0 100644
--- a/ndk/platforms/android-21/arch-mips64/symbols/libc.so.functions.txt
+++ b/ndk/platforms/android-21/arch-mips64/symbols/libc.so.functions.txt
@@ -58,7 +58,6 @@ __p_time
 __p_type
 __pthread_cleanup_pop
 __pthread_cleanup_push
-__pthread_gettid
 __putlong
 __putshort
 __read_chk
@@ -206,7 +205,6 @@ dup2
 dup3
 duplocale
 endmntent
-endpwent
 endservent
 endutent
 epoll_create
diff --git a/ndk/platforms/android-21/arch-x86/symbols/libc.so.variables.txt b/ndk/platforms/android-21/arch-x86/symbols/libc.so.variables.txt
index 5fa9d800d..224980e67 100644
--- a/ndk/platforms/android-21/arch-x86/symbols/libc.so.variables.txt
+++ b/ndk/platforms/android-21/arch-x86/symbols/libc.so.variables.txt
@@ -3,7 +3,6 @@ __p_class_syms
 __p_type_syms
 __page_shift
 __page_size
-__popcount_tab
 __progname
 __sF
 __stack_chk_guard
diff --git a/ndk/platforms/android-21/arch-x86_64/symbols/libc.so.functions.txt b/ndk/platforms/android-21/arch-x86_64/symbols/libc.so.functions.txt
index ed47c332c..a08268eb0 100644
--- a/ndk/platforms/android-21/arch-x86_64/symbols/libc.so.functions.txt
+++ b/ndk/platforms/android-21/arch-x86_64/symbols/libc.so.functions.txt
@@ -58,7 +58,6 @@ __p_time
 __p_type
 __pthread_cleanup_pop
 __pthread_cleanup_push
-__pthread_gettid
 __putlong
 __putshort
 __read_chk
@@ -206,7 +205,6 @@ dup2
 dup3
 duplocale
 endmntent
-endpwent
 endservent
 endutent
 epoll_create