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

Commit 31e93742 authored by Nicolas Geoffray's avatar Nicolas Geoffray Committed by android-build-merger
Browse files

Merge "Conscrypt should only link against bionic."

am: 1cab2c6b

Change-Id: I8ee133fed8bbf6f87c90680da91ffa018c49fcba
parents 04036771 1cab2c6b
Loading
Loading
Loading
Loading
+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__)
+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
+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