11 files changed, 19 insertions, 13 deletions
diff --git a/runtime/native_bridge_art_interface.cc b/runtime/native_bridge_art_interface.cc
index 0651f0ca6a..a081a2d7db 100644
--- a/runtime/native_bridge_art_interface.cc
+++ b/runtime/native_bridge_art_interface.cc
@@ -30,7 +30,7 @@
 #include "scoped_thread_state_change-inl.h"
 #include "sigchain.h"
 
-namespace art {
+namespace art HIDDEN {
 
 static const char* GetMethodShorty(JNIEnv* env, jmethodID mid) {
   ScopedObjectAccess soa(env);
diff --git a/runtime/native_bridge_art_interface.h b/runtime/native_bridge_art_interface.h
index 873cd1fdef..5aeaebf2ca 100644
--- a/runtime/native_bridge_art_interface.h
+++ b/runtime/native_bridge_art_interface.h
@@ -21,7 +21,9 @@
 #include <stdint.h>
 #include <string>
 
-namespace art {
+#include "base/macros.h"
+
+namespace art HIDDEN {
 
 // Mirror libnativebridge interface. Done to have the ART callbacks out of line, and not require
 // the system/core header file in other files.
diff --git a/runtime/native_stack_dump.cc b/runtime/native_stack_dump.cc
index d8ff871d87..ad09762972 100644
--- a/runtime/native_stack_dump.cc
+++ b/runtime/native_stack_dump.cc
@@ -59,7 +59,7 @@
 
 #endif
 
-namespace art {
+namespace art HIDDEN {
 
 #if defined(__linux__)
 
diff --git a/runtime/native_stack_dump.h b/runtime/native_stack_dump.h
index 86a8ce2cab..06c2fb76f7 100644
--- a/runtime/native_stack_dump.h
+++ b/runtime/native_stack_dump.h
@@ -27,7 +27,7 @@ namespace unwindstack {
 class AndroidLocalUnwinder;
 }  // namespace unwindstack
 
-namespace art {
+namespace art HIDDEN {
 
 class ArtMethod;
 
diff --git a/runtime/native_stack_dump_test.cc b/runtime/native_stack_dump_test.cc
index 4446495ede..d2a2fc3ee3 100644
--- a/runtime/native_stack_dump_test.cc
+++ b/runtime/native_stack_dump_test.cc
@@ -18,7 +18,7 @@
 
 #include <gtest/gtest.h>
 
-namespace art {
+namespace art HIDDEN {
 
 TEST(StripParametersTest, ValidInput) {
   EXPECT_EQ(StripParameters("foo(int)"), "foo");
diff --git a/runtime/non_debuggable_classes.cc b/runtime/non_debuggable_classes.cc
index a35152fa06..15e05c0cff 100644
--- a/runtime/non_debuggable_classes.cc
+++ b/runtime/non_debuggable_classes.cc
@@ -24,7 +24,7 @@
 #include "thread-current-inl.h"
 #include "thread-inl.h"
 
-namespace art {
+namespace art HIDDEN {
 
 std::vector<jclass>  NonDebuggableClasses::non_debuggable_classes;
 
diff --git a/runtime/non_debuggable_classes.h b/runtime/non_debuggable_classes.h
index e2c51e62ce..eb0d474d82 100644
--- a/runtime/non_debuggable_classes.h
+++ b/runtime/non_debuggable_classes.h
@@ -20,9 +20,10 @@
 #include <vector>
 
 #include "base/locks.h"
+#include "base/macros.h"
 #include "jni.h"
 
-namespace art {
+namespace art HIDDEN {
 
 struct NonDebuggableClasses {
  public:
@@ -34,7 +35,7 @@ struct NonDebuggableClasses {
       REQUIRES_SHARED(Locks::mutator_lock_);
 
  private:
-  static std::vector<jclass> non_debuggable_classes;
+  EXPORT static std::vector<jclass> non_debuggable_classes;
 };
 
 }  // namespace art
diff --git a/runtime/noop_compiler_callbacks.h b/runtime/noop_compiler_callbacks.h
index 1e4e701d97..34e15e71ad 100644
--- a/runtime/noop_compiler_callbacks.h
+++ b/runtime/noop_compiler_callbacks.h
@@ -17,9 +17,10 @@
 #ifndef ART_RUNTIME_NOOP_COMPILER_CALLBACKS_H_
 #define ART_RUNTIME_NOOP_COMPILER_CALLBACKS_H_
 
+#include "base/macros.h"
 #include "compiler_callbacks.h"
 
-namespace art {
+namespace art HIDDEN {
 
 class NoopCompilerCallbacks final : public CompilerCallbacks {
  public:
diff --git a/runtime/nterp_helpers.cc b/runtime/nterp_helpers.cc
index b39cbef10e..328ef629c4 100644
--- a/runtime/nterp_helpers.cc
+++ b/runtime/nterp_helpers.cc
@@ -23,7 +23,7 @@
 #include "oat/oat_quick_method_header.h"
 #include "quick/quick_method_frame_info.h"
 
-namespace art {
+namespace art HIDDEN {
 
 /**
  * An nterp frame follows the optimizing compiler's ABI conventions, with
diff --git a/runtime/nterp_helpers.h b/runtime/nterp_helpers.h
index f79dcf94f3..6ce2038a9d 100644
--- a/runtime/nterp_helpers.h
+++ b/runtime/nterp_helpers.h
@@ -17,9 +17,10 @@
 #ifndef ART_RUNTIME_NTERP_HELPERS_H_
 #define ART_RUNTIME_NTERP_HELPERS_H_
 
+#include "base/macros.h"
 #include "quick/quick_method_frame_info.h"
 
-namespace art {
+namespace art HIDDEN {
 
 class ArtMethod;
 
@@ -72,7 +73,7 @@ uint32_t NterpGetVRegReference(ArtMethod** frame, uint16_t vreg)
  * Returns whether the given method can run with nterp. The instruction set can
  * be passed for cross-compilation.
  */
-bool CanMethodUseNterp(ArtMethod* method, InstructionSet isa = kRuntimeISA)
+EXPORT bool CanMethodUseNterp(ArtMethod* method, InstructionSet isa = kRuntimeISA)
     REQUIRES_SHARED(Locks::mutator_lock_);
 
 /**
diff --git a/runtime/nth_caller_visitor.h b/runtime/nth_caller_visitor.h
index ffec179f2f..771c672554 100644
--- a/runtime/nth_caller_visitor.h
+++ b/runtime/nth_caller_visitor.h
@@ -17,11 +17,12 @@
 #ifndef ART_RUNTIME_NTH_CALLER_VISITOR_H_
 #define ART_RUNTIME_NTH_CALLER_VISITOR_H_
 
+#include "base/macros.h"
 #include "art_method.h"
 #include "base/locks.h"
 #include "stack.h"
 
-namespace art {
+namespace art HIDDEN {
 class Thread;
 
 // Walks up the stack 'n' callers, when used with Thread::WalkStack.