commit 7aa6ba4aec3dc59738457fcd2dc83e3b6d817fd3
author Ryan Prichard <rprichard@google.com> Mon Mar 09 21:00:58 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 09 21:00:58 2020 +0000
tree ce763fe67564ff8ebeb32bb642108d53d5aab5ed
parent 7d97c36b3f3c8f69814814b86e260ba94a5b2fd4
parent afa983c8d44400d45c1f0e2b8e90a8be04acf6f7

Merge "Rewrite __cxa_atexit / __cxa_finalize"

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index 3448094..4d35592 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1692,7 +1692,10 @@
 
     stubs: {
         symbol_file: "libc.map.txt",
-        versions: ["10000"],
+        versions: [
+            "29",
+            "10000",
+        ],
     },
 
     apex_available: [

libdl/Android.bp

diff --git a/libdl/Android.bp b/libdl/Android.bp
index 59f1937..8e3a3fc 100644
--- a/libdl/Android.bp
+++ b/libdl/Android.bp
@@ -111,7 +111,10 @@
 
     stubs: {
         symbol_file: "libdl.map.txt",
-        versions: ["10000"],
+        versions: [
+            "29",
+            "10000",
+        ],
     },
 
     apex_available: [

libm/Android.bp

diff --git a/libm/Android.bp b/libm/Android.bp
index d4cdd7b..1c4fe55 100644
--- a/libm/Android.bp
+++ b/libm/Android.bp
@@ -499,7 +499,10 @@
 
     stubs: {
         symbol_file: "libm.map.txt",
-        versions: ["10000"],
+        versions: [
+            "29",
+            "10000",
+        ],
     },
 
     apex_available: [