Merge "hiddenapi: Enable assign-all CHECK"
diff --git a/build/apex/ld.config.txt b/build/apex/ld.config.txt
index 0129772..9e02f9f 100644
--- a/build/apex/ld.config.txt
+++ b/build/apex/ld.config.txt
@@ -10,8 +10,11 @@
[runtime]
additional.namespaces = platform,conscrypt
-# Keep in sync with runtime namespace in /system/etc/ld.config.txt.
+# Keep in sync with the runtime namespace in /system/etc/ld.config.txt.
namespace.default.isolated = true
+# Visible because some libraries are dlopen'ed, e.g. libopenjdk is dlopen'ed by
+# libart.
+namespace.default.visible = true
namespace.default.search.paths = /apex/com.android.runtime/${LIB}
# odex files are in /system/framework. dalvikvm has to be able to dlopen the
# files for CTS.
@@ -20,7 +23,7 @@
# TODO(b/119867084): Restrict fallback to platform namespace to PALette library.
namespace.default.link.platform.allow_all_shared_libs = true
-# Keep in sync with default namespace in /system/etc/ld.config.txt.
+# Keep in sync with the default namespace in /system/etc/ld.config.txt.
namespace.platform.isolated = true
namespace.platform.search.paths = /system/${LIB}
namespace.platform.links = default
diff --git a/runtime/Android.bp b/runtime/Android.bp
index a3081e9..b89eb02 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -396,10 +396,8 @@
"libnativeloader",
"libbacktrace",
"liblog",
- // For atrace, properties, ashmem.
+ // For atrace, properties, ashmem, set_sched_policy.
"libcutils",
- // For set_sched_policy.
- "libprocessgroup",
// For common macros.
"libbase",
],
diff --git a/runtime/thread_android.cc b/runtime/thread_android.cc
index 24864f9..8ff6c52 100644
--- a/runtime/thread_android.cc
+++ b/runtime/thread_android.cc
@@ -21,7 +21,7 @@
#include <sys/resource.h>
#include <sys/time.h>
-#include <processgroup/sched_policy.h>
+#include <cutils/sched_policy.h>
#include <utils/threads.h>
#include "base/macros.h"