Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce7e9def authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Add version #29 and #30 to liblog" am: d82d9851 am: 4a7a61d2

Change-Id: Ifef90acf8400429664efe4e81a2f8bb6ec3cb2d0
parents 8e0e2797 4a7a61d2
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ cc_library {

    stubs: {
        symbol_file: "liblog.map.txt",
        versions: ["10000"],
        versions: ["29", "30"],
    },

    // TODO(tomcherry): Renable this before release branch is cut
+6 −2
Original line number Diff line number Diff line
@@ -54,18 +54,22 @@ LIBLOG_O {
    __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;