ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Conscrypt should only link against bionic."

Browse source
This commit is contained in:
Nicolas Geoffray 2019-01-23 09:08:42 +00:00 • committed by Gerrit Code Review
commit 1cab2c6bec
3 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libnativeloader/native_loader.cpp
View file

@ -43,10 +43,6 @@
#include <android-base/properties.h> #include <android-base/properties.h>
#endif #endif
extern "C" {
struct android_namespace_t* android_get_exported_namespace(const char*);
}
#define CHECK(predicate) LOG_ALWAYS_FATAL_IF(!(predicate),\ #define CHECK(predicate) LOG_ALWAYS_FATAL_IF(!(predicate),\
"%s:%d: %s CHECK '" #predicate "' failed.",\ "%s:%d: %s CHECK '" #predicate "' failed.",\
__FILE__, __LINE__, __FUNCTION__) __FILE__, __LINE__, __FUNCTION__)

7
rootdir/etc/ld.config.txt
View file

@ -152,11 +152,12 @@ namespace.media.link.default.shared_libs += %SANITIZER_RUNTIME_LIBRARIES%
namespace.conscrypt.isolated = true namespace.conscrypt.isolated = true
namespace.conscrypt.visible = 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.search.paths = /apex/com.android.conscrypt/${LIB}
namespace.conscrypt.links = default namespace.conscrypt.links = default
# TODO(b/119867084): Restrict to Bionic dlopen dependencies and PALette library namespace.conscrypt.link.default.shared_libs = libc.so
# when it exists. namespace.conscrypt.link.default.shared_libs += libm.so
namespace.conscrypt.link.default.allow_all_shared_libs = true namespace.conscrypt.link.default.shared_libs += libdl.so
############################################################################### ###############################################################################
# "sphal" namespace # "sphal" namespace

7
rootdir/etc/ld.config.vndk_lite.txt
View file

@ -99,11 +99,12 @@ namespace.media.link.default.shared_libs += %SANITIZER_RUNTIME_LIBRARIES%
namespace.conscrypt.isolated = true namespace.conscrypt.isolated = true
namespace.conscrypt.visible = 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.search.paths = /apex/com.android.conscrypt/${LIB}
namespace.conscrypt.links = default namespace.conscrypt.links = default
# TODO(b/119867084): Restrict to Bionic dlopen dependencies and PALette library namespace.conscrypt.link.default.shared_libs = libc.so
# when it exists. namespace.conscrypt.link.default.shared_libs += libm.so
namespace.conscrypt.link.default.allow_all_shared_libs = true namespace.conscrypt.link.default.shared_libs += libdl.so
############################################################################### ###############################################################################
# "sphal" namespace # "sphal" namespace