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

Commit 1cab2c6b authored by Nicolas Geoffray's avatar Nicolas Geoffray Committed by Gerrit Code Review
Browse files

Merge "Conscrypt should only link against bionic."

parents 62b80fa3 88bdf80d

libnativeloader/native_loader.cpp

+0 −4
Original line number Diff line number Diff line
@@ -43,10 +43,6 @@ 
#include <android-base/properties.h>

#endif



extern "C" {

struct android_namespace_t* android_get_exported_namespace(const char*);

}



#define CHECK(predicate) LOG_ALWAYS_FATAL_IF(!(predicate),\

                                             "%s:%d: %s CHECK '" #predicate "' failed.",\

                                             __FILE__, __LINE__, __FUNCTION__)

rootdir/etc/ld.config.txt

+4 −3
Original line number Diff line number Diff line
@@ -152,11 +152,12 @@ namespace.media.link.default.shared_libs += %SANITIZER_RUNTIME_LIBRARIES% 
namespace.conscrypt.isolated = true

namespace.conscrypt.visible = true



# Keep in sync with ld.config.txt in the com.android.runtime APEX.

namespace.conscrypt.search.paths = /apex/com.android.conscrypt/${LIB}

namespace.conscrypt.links = default

# TODO(b/119867084): Restrict to Bionic dlopen dependencies and PALette library

# when it exists.

namespace.conscrypt.link.default.allow_all_shared_libs = true

namespace.conscrypt.link.default.shared_libs  = libc.so

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

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



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

# "sphal" namespace

rootdir/etc/ld.config.vndk_lite.txt

+4 −3
Original line number Diff line number Diff line
@@ -99,11 +99,12 @@ namespace.media.link.default.shared_libs += %SANITIZER_RUNTIME_LIBRARIES% 
namespace.conscrypt.isolated = true

namespace.conscrypt.visible = true



# Keep in sync with ld.config.txt in the com.android.runtime APEX.

namespace.conscrypt.search.paths = /apex/com.android.conscrypt/${LIB}

namespace.conscrypt.links = default

# TODO(b/119867084): Restrict to Bionic dlopen dependencies and PALette library

# when it exists.

namespace.conscrypt.link.default.allow_all_shared_libs = true

namespace.conscrypt.link.default.shared_libs  = libc.so

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

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



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

# "sphal" namespace