commit 1232da5c477dd618dcef3d13c40295891cdf6b24
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 17 03:46:21 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 17 03:46:21 2020 +0000
tree b75e32c0dc695002909056b2f036abbd6bb5267d
parent 3f59a727bc9439c549d7fd3a334c61b174805a76
parent 24c5df637d8415ada1f1f1354d4d2b98681a52a8

Merge "Add version #29 and #30 to liblog" am: d82d9851de am: 4a7a61d2c6 am: ce7e9def60

Change-Id: I3c57b4fd3964d91d74fc735ce4b0fd2c4570d46f

liblog/Android.bp

diff --git a/liblog/Android.bp b/liblog/Android.bp
index bab57c0..58c96b6 100644
--- a/liblog/Android.bp
+++ b/liblog/Android.bp
@@ -103,7 +103,7 @@
 
     stubs: {
         symbol_file: "liblog.map.txt",
-        versions: ["10000"],
+        versions: ["29", "30"],
     },
 
     // TODO(tomcherry): Renable this before release branch is cut

liblog/liblog.map.txt

diff --git a/liblog/liblog.map.txt b/liblog/liblog.map.txt
index 2dd8059..65194ce 100644
--- a/liblog/liblog.map.txt
+++ b/liblog/liblog.map.txt
@@ -54,18 +54,22 @@
     __android_log_is_debuggable; # apex llndk
 };
 
-LIBLOG_Q {
+LIBLOG_Q { # introduced=29
   global:
     __android_log_bswrite; # apex
     __android_log_btwrite; # apex
     __android_log_bwrite; # apex
     __android_log_close; # apex
     __android_log_security; # apex
-    __android_log_security_bswrite; # apex
     android_log_reset; # llndk
     android_log_parser_reset; # llndk
 };
 
+LIGLOG_R { # introduced=30
+  global:
+    __android_log_security_bswrite; # apex
+};
+
 LIBLOG_PRIVATE {
   global:
     __android_log_pmsg_file_read;