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

Commit fe1f7017 authored by Tom Cherry's avatar Tom Cherry
Browse files

liblog: add stubs variant 

Ensure that only the symbols in liblog.map.txt can be used by the
platform.

Bug: 123349183
Test: build
Change-Id: I99ae5d0e8ba8f5061ec20701c941d861c9eb615d
parent 86f38d56

liblog/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -101,6 +101,11 @@ cc_library { 
    header_libs: ["liblog_headers"],

    export_header_lib_headers: ["liblog_headers"],



    stubs: {

        symbol_file: "liblog.map.txt",

        versions: ["10000"],

    },



    cflags: [

        "-Werror",

        // This is what we want to do:

liblog/liblog.map.txt

+22 −22
Original line number Diff line number Diff line
@@ -19,12 +19,12 @@ LIBLOG_L { 
    android_logger_get_log_readable_size; # vndk

    android_logger_get_log_version; # vndk

    android_logger_get_log_size; # vndk

    android_logger_list_alloc; # vndk

    android_logger_list_alloc_time; # vndk

    android_logger_list_free; # vndk

    android_logger_list_alloc; # apex vndk

    android_logger_list_alloc_time; # apex vndk

    android_logger_list_free; # apex vndk

    android_logger_list_open; # vndk

    android_logger_list_read; # vndk

    android_logger_open; # vndk

    android_logger_list_read; # apex vndk

    android_logger_open; # apex vndk

    android_logger_set_log_size; # vndk

};
@@ -33,42 +33,42 @@ LIBLOG_M { 
    android_logger_get_prune_list; # vndk

    android_logger_set_prune_list; # vndk

    android_logger_get_statistics; # vndk

    __android_log_error_write; # vndk

    __android_log_error_write; # apex vndk

    __android_log_is_loggable;

    create_android_logger; #vndk

    android_log_destroy; #vndk

    android_log_write_list_begin; #vndk

    android_log_write_list_end; #vndk

    android_log_write_int32; #vndk

    android_log_write_int64; #vndk

    android_log_write_string8; #vndk

    android_log_write_string8_len; #vndk

    android_log_write_float32; #vndk

    android_log_write_list; #vndk

    create_android_logger; # apex vndk

    android_log_destroy; # apex vndk

    android_log_write_list_begin; # apex vndk

    android_log_write_list_end; # apex vndk

    android_log_write_int32; # apex vndk

    android_log_write_int64; # apex vndk

    android_log_write_string8; # apex vndk

    android_log_write_string8_len; # apex vndk

    android_log_write_float32; # apex vndk

    android_log_write_list; # apex vndk



};



LIBLOG_O {

  global:

    __android_log_is_loggable_len;

    __android_log_is_debuggable; # vndk

    __android_log_is_debuggable; # apex vndk

};



LIBLOG_Q {

  global:

    __android_log_bswrite; # apex

    __android_log_btwrite; # apex

    __android_log_bwrite; # apex

    __android_log_close; # apex

    __android_log_security; # apex

    android_log_reset; #vndk

    android_log_parser_reset; #vndk

};



LIBLOG_PRIVATE {

  global:

    __android_log_bswrite;

    __android_log_btwrite;

    __android_log_bwrite;

    __android_log_close;

    __android_log_pmsg_file_read;

    __android_log_pmsg_file_write;

    __android_log_security;

    __android_log_security_bswrite;

    __android_logger_get_buffer_size;

    __android_logger_property_get_bool;

rootdir/etc/ld.config.legacy.txt

+2 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ namespace.conscrypt.link.runtime.shared_libs = libjavacore.so 
namespace.conscrypt.link.default.shared_libs  = libc.so

namespace.conscrypt.link.default.shared_libs += libm.so

namespace.conscrypt.link.default.shared_libs += libdl.so

namespace.conscrypt.link.default.shared_libs += liblog.so



###############################################################################

# "resolv" APEX namespace
@@ -130,6 +131,7 @@ namespace.resolv.link.default.shared_libs = libc.so 
namespace.resolv.link.default.shared_libs += libm.so

namespace.resolv.link.default.shared_libs += libdl.so

namespace.resolv.link.default.shared_libs += libbinder_ndk.so

namespace.resolv.link.default.shared_libs += liblog.so

namespace.resolv.link.default.shared_libs += libvndksupport.so



###############################################################################

rootdir/etc/ld.config.txt

+4 −0
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ namespace.conscrypt.link.runtime.shared_libs = libjavacore.so 
namespace.conscrypt.link.default.shared_libs  = libc.so

namespace.conscrypt.link.default.shared_libs += libm.so

namespace.conscrypt.link.default.shared_libs += libdl.so

namespace.conscrypt.link.default.shared_libs += liblog.so



###############################################################################

# "resolv" APEX namespace
@@ -208,6 +209,7 @@ namespace.resolv.link.default.shared_libs = libc.so 
namespace.resolv.link.default.shared_libs += libm.so

namespace.resolv.link.default.shared_libs += libdl.so

namespace.resolv.link.default.shared_libs += libbinder_ndk.so

namespace.resolv.link.default.shared_libs += liblog.so

namespace.resolv.link.default.shared_libs += libvndksupport.so



###############################################################################
@@ -574,6 +576,7 @@ namespace.conscrypt.link.runtime.shared_libs = libjavacore.so 
namespace.conscrypt.link.default.shared_libs  = libc.so

namespace.conscrypt.link.default.shared_libs += libm.so

namespace.conscrypt.link.default.shared_libs += libdl.so

namespace.conscrypt.link.default.shared_libs += liblog.so



###############################################################################

# "resolv" APEX namespace
@@ -590,6 +593,7 @@ namespace.resolv.link.default.shared_libs = libc.so 
namespace.resolv.link.default.shared_libs += libm.so

namespace.resolv.link.default.shared_libs += libdl.so

namespace.resolv.link.default.shared_libs += libbinder_ndk.so

namespace.resolv.link.default.shared_libs += liblog.so





###############################################################################

rootdir/etc/ld.config.vndk_lite.txt

+2 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ namespace.conscrypt.link.runtime.shared_libs = libjavacore.so 
namespace.conscrypt.link.default.shared_libs  = libc.so

namespace.conscrypt.link.default.shared_libs += libm.so

namespace.conscrypt.link.default.shared_libs += libdl.so

namespace.conscrypt.link.default.shared_libs += liblog.so



###############################################################################

# "resolv" APEX namespace
@@ -149,6 +150,7 @@ namespace.resolv.link.default.shared_libs = libc.so 
namespace.resolv.link.default.shared_libs += libm.so

namespace.resolv.link.default.shared_libs += libdl.so

namespace.resolv.link.default.shared_libs += libbinder_ndk.so

namespace.resolv.link.default.shared_libs += liblog.so

namespace.resolv.link.default.shared_libs += libvndksupport.so



###############################################################################