commit aa922bbaf38d896ecb46ae08c675c2ef0df811db
author Dimitry Ivanov <dimitry@google.com> Wed May 30 15:32:40 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 30 15:32:40 2018 +0000
tree 2f60eaa9345f752e896269a91fed215cab7d2e12
parent d980cc0c51137c435c1a6bd4f802eff9b6b688c3
parent 55547db4345ee692b9cfe727c97dd860ed8263f8

Merge "Add secondary counter in place of tls_nodelete flag"

libc/libc.arm.map

diff --git a/libc/libc.arm.map b/libc/libc.arm.map
index ee05b16..159d4a0 100644
--- a/libc/libc.arm.map
+++ b/libc/libc.arm.map
@@ -746,7 +746,7 @@
     pthread_cond_signal;
     pthread_cond_timedwait;
     pthread_cond_timedwait_monotonic; # arm x86 mips
-    pthread_cond_timedwait_monotonic_np; # introduced-arm=16 introduced-x86=16 introduced-mips=16 introduced-arm64=28 introduced-x64_64=28 introduced-mips64=28
+    pthread_cond_timedwait_monotonic_np; # introduced-arm=9 introduced-x86=9 introduced-mips=9 introduced-arm64=28 introduced-x64_64=28 introduced-mips64=28
     pthread_cond_timedwait_relative_np; # arm x86 mips
     pthread_cond_timeout_np; # arm x86 mips
     pthread_cond_wait;

libc/libc.arm64.map

diff --git a/libc/libc.arm64.map b/libc/libc.arm64.map
index 5e6f991..7702f9e 100644
--- a/libc/libc.arm64.map
+++ b/libc/libc.arm64.map
@@ -692,7 +692,7 @@
     pthread_cond_init;
     pthread_cond_signal;
     pthread_cond_timedwait;
-    pthread_cond_timedwait_monotonic_np; # introduced-arm=16 introduced-x86=16 introduced-mips=16 introduced-arm64=28 introduced-x64_64=28 introduced-mips64=28
+    pthread_cond_timedwait_monotonic_np; # introduced-arm=9 introduced-x86=9 introduced-mips=9 introduced-arm64=28 introduced-x64_64=28 introduced-mips64=28
     pthread_cond_wait;
     pthread_condattr_destroy;
     pthread_condattr_getclock; # introduced=21

libc/libc.map.txt

diff --git a/libc/libc.map.txt b/libc/libc.map.txt
index 6bbffba..ebe2098 100644
--- a/libc/libc.map.txt
+++ b/libc/libc.map.txt
@@ -771,7 +771,7 @@
     pthread_cond_signal;
     pthread_cond_timedwait;
     pthread_cond_timedwait_monotonic; # arm x86 mips
-    pthread_cond_timedwait_monotonic_np; # introduced-arm=16 introduced-x86=16 introduced-mips=16 introduced-arm64=28 introduced-x64_64=28 introduced-mips64=28
+    pthread_cond_timedwait_monotonic_np; # introduced-arm=9 introduced-x86=9 introduced-mips=9 introduced-arm64=28 introduced-x64_64=28 introduced-mips64=28
     pthread_cond_timedwait_relative_np; # arm x86 mips
     pthread_cond_timeout_np; # arm x86 mips
     pthread_cond_wait;

libc/libc.mips.map

diff --git a/libc/libc.mips.map b/libc/libc.mips.map
index cdba570..d04cb4f 100644
--- a/libc/libc.mips.map
+++ b/libc/libc.mips.map
@@ -744,7 +744,7 @@
     pthread_cond_signal;
     pthread_cond_timedwait;
     pthread_cond_timedwait_monotonic; # arm x86 mips
-    pthread_cond_timedwait_monotonic_np; # introduced-arm=16 introduced-x86=16 introduced-mips=16 introduced-arm64=28 introduced-x64_64=28 introduced-mips64=28
+    pthread_cond_timedwait_monotonic_np; # introduced-arm=9 introduced-x86=9 introduced-mips=9 introduced-arm64=28 introduced-x64_64=28 introduced-mips64=28
     pthread_cond_timedwait_relative_np; # arm x86 mips
     pthread_cond_timeout_np; # arm x86 mips
     pthread_cond_wait;

libc/libc.mips64.map

diff --git a/libc/libc.mips64.map b/libc/libc.mips64.map
index 5e6f991..7702f9e 100644
--- a/libc/libc.mips64.map
+++ b/libc/libc.mips64.map
@@ -692,7 +692,7 @@
     pthread_cond_init;
     pthread_cond_signal;
     pthread_cond_timedwait;
-    pthread_cond_timedwait_monotonic_np; # introduced-arm=16 introduced-x86=16 introduced-mips=16 introduced-arm64=28 introduced-x64_64=28 introduced-mips64=28
+    pthread_cond_timedwait_monotonic_np; # introduced-arm=9 introduced-x86=9 introduced-mips=9 introduced-arm64=28 introduced-x64_64=28 introduced-mips64=28
     pthread_cond_wait;
     pthread_condattr_destroy;
     pthread_condattr_getclock; # introduced=21

libc/libc.x86.map

diff --git a/libc/libc.x86.map b/libc/libc.x86.map
index 5cb0cf4..2e10bbb 100644
--- a/libc/libc.x86.map
+++ b/libc/libc.x86.map
@@ -742,7 +742,7 @@
     pthread_cond_signal;
     pthread_cond_timedwait;
     pthread_cond_timedwait_monotonic; # arm x86 mips
-    pthread_cond_timedwait_monotonic_np; # introduced-arm=16 introduced-x86=16 introduced-mips=16 introduced-arm64=28 introduced-x64_64=28 introduced-mips64=28
+    pthread_cond_timedwait_monotonic_np; # introduced-arm=9 introduced-x86=9 introduced-mips=9 introduced-arm64=28 introduced-x64_64=28 introduced-mips64=28
     pthread_cond_timedwait_relative_np; # arm x86 mips
     pthread_cond_timeout_np; # arm x86 mips
     pthread_cond_wait;

libc/libc.x86_64.map

diff --git a/libc/libc.x86_64.map b/libc/libc.x86_64.map
index 5e6f991..7702f9e 100644
--- a/libc/libc.x86_64.map
+++ b/libc/libc.x86_64.map
@@ -692,7 +692,7 @@
     pthread_cond_init;
     pthread_cond_signal;
     pthread_cond_timedwait;
-    pthread_cond_timedwait_monotonic_np; # introduced-arm=16 introduced-x86=16 introduced-mips=16 introduced-arm64=28 introduced-x64_64=28 introduced-mips64=28
+    pthread_cond_timedwait_monotonic_np; # introduced-arm=9 introduced-x86=9 introduced-mips=9 introduced-arm64=28 introduced-x64_64=28 introduced-mips64=28
     pthread_cond_wait;
     pthread_condattr_destroy;
     pthread_condattr_getclock; # introduced=21

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 12d3a78..9503a49 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -189,7 +189,6 @@
     "libgui.so",
     "libmedia.so",
     "libnativehelper.so",
-    "libskia.so",
     "libssl.so",
     "libstagefright.so",
     "libsqlite.so",