Revert "Add visibility attributes in runtime/entrypoints and runtime/native"
This reverts commit 3d10d9399776f36955bdcd7d75a5e0fe8648d020.
Reason for revert: b/319255249
Change-Id: I46c96f5ae78606a7c7c6e2df7368ca1b3362d501
diff --git a/runtime/entrypoints/entrypoint_utils-inl.h b/runtime/entrypoints/entrypoint_utils-inl.h
index a854e0c..4a1dfba 100644
--- a/runtime/entrypoints/entrypoint_utils-inl.h
+++ b/runtime/entrypoints/entrypoint_utils-inl.h
@@ -47,7 +47,7 @@
#include "thread.h"
#include "well_known_classes.h"
-namespace art HIDDEN {
+namespace art {
inline std::string GetResolvedMethodErrorString(ClassLinker* class_linker,
ArtMethod* inlined_method,
diff --git a/runtime/entrypoints/entrypoint_utils.cc b/runtime/entrypoints/entrypoint_utils.cc
index 96a2231..aa27df4 100644
--- a/runtime/entrypoints/entrypoint_utils.cc
+++ b/runtime/entrypoints/entrypoint_utils.cc
@@ -43,7 +43,7 @@
#include "scoped_thread_state_change-inl.h"
#include "well_known_classes-inl.h"
-namespace art HIDDEN {
+namespace art {
void CheckReferenceResult(Handle<mirror::Object> o, Thread* self) {
if (o == nullptr) {
diff --git a/runtime/entrypoints/entrypoint_utils.h b/runtime/entrypoints/entrypoint_utils.h
index 3dfeaae..cfa744d 100644
--- a/runtime/entrypoints/entrypoint_utils.h
+++ b/runtime/entrypoints/entrypoint_utils.h
@@ -29,7 +29,7 @@
#include "handle.h"
#include "jvalue.h"
-namespace art HIDDEN {
+namespace art {
namespace mirror {
class Array;
diff --git a/runtime/entrypoints/jni/jni_entrypoints.cc b/runtime/entrypoints/jni/jni_entrypoints.cc
index 885764f..359614b 100644
--- a/runtime/entrypoints/jni/jni_entrypoints.cc
+++ b/runtime/entrypoints/jni/jni_entrypoints.cc
@@ -33,7 +33,7 @@
#include "stack_map.h"
#include "thread.h"
-namespace art HIDDEN {
+namespace art {
static inline uint32_t GetInvokeStaticMethodIndex(ArtMethod* caller, uint32_t dex_pc)
REQUIRES_SHARED(Locks::mutator_lock_) {
diff --git a/runtime/entrypoints/jni/jni_entrypoints.h b/runtime/entrypoints/jni/jni_entrypoints.h
index 4b515db..def9ddb 100644
--- a/runtime/entrypoints/jni/jni_entrypoints.h
+++ b/runtime/entrypoints/jni/jni_entrypoints.h
@@ -25,7 +25,7 @@
#define JNI_ENTRYPOINT_OFFSET(ptr_size, x) \
Thread::JniEntryPointOffset<ptr_size>(OFFSETOF_MEMBER(JniEntryPoints, x))
-namespace art HIDDEN {
+namespace art {
// Pointers to functions that are called by JNI trampolines via thread-local storage.
struct JniEntryPoints {
diff --git a/runtime/entrypoints/math_entrypoints.cc b/runtime/entrypoints/math_entrypoints.cc
index 5db8dbf..b0eaf1e 100644
--- a/runtime/entrypoints/math_entrypoints.cc
+++ b/runtime/entrypoints/math_entrypoints.cc
@@ -18,7 +18,7 @@
#include "entrypoint_utils-inl.h"
-namespace art HIDDEN {
+namespace art {
extern "C" double art_l2d(int64_t l) {
return static_cast<double>(l);
diff --git a/runtime/entrypoints/math_entrypoints_test.cc b/runtime/entrypoints/math_entrypoints_test.cc
index 337f9f0..fe61f5d 100644
--- a/runtime/entrypoints/math_entrypoints_test.cc
+++ b/runtime/entrypoints/math_entrypoints_test.cc
@@ -20,7 +20,7 @@
#include "base/common_art_test.h"
-namespace art HIDDEN {
+namespace art {
class MathEntrypointsTest : public CommonArtTest {};
diff --git a/runtime/entrypoints/quick/callee_save_frame.h b/runtime/entrypoints/quick/callee_save_frame.h
index 8121923..7d9b844 100644
--- a/runtime/entrypoints/quick/callee_save_frame.h
+++ b/runtime/entrypoints/quick/callee_save_frame.h
@@ -32,7 +32,7 @@
#include "arch/x86/callee_save_frame_x86.h"
#include "arch/x86_64/callee_save_frame_x86_64.h"
-namespace art HIDDEN {
+namespace art {
class ArtMethod;
class ScopedQuickEntrypointChecks {
diff --git a/runtime/entrypoints/quick/quick_alloc_entrypoints.cc b/runtime/entrypoints/quick/quick_alloc_entrypoints.cc
index 82595ed..7b3d849 100644
--- a/runtime/entrypoints/quick/quick_alloc_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_alloc_entrypoints.cc
@@ -27,7 +27,7 @@
#include "mirror/object_array-inl.h"
#include "mirror/string-alloc-inl.h"
-namespace art HIDDEN {
+namespace art {
static constexpr bool kUseTlabFastPath = true;
diff --git a/runtime/entrypoints/quick/quick_alloc_entrypoints.h b/runtime/entrypoints/quick/quick_alloc_entrypoints.h
index 94f4a27..c4d8a80 100644
--- a/runtime/entrypoints/quick/quick_alloc_entrypoints.h
+++ b/runtime/entrypoints/quick/quick_alloc_entrypoints.h
@@ -21,7 +21,7 @@
#include "gc/allocator_type.h"
#include "quick_entrypoints.h"
-namespace art HIDDEN {
+namespace art {
void ResetQuickAllocEntryPoints(QuickEntryPoints* qpoints);
diff --git a/runtime/entrypoints/quick/quick_cast_entrypoints.cc b/runtime/entrypoints/quick/quick_cast_entrypoints.cc
index a32c483..083d578 100644
--- a/runtime/entrypoints/quick/quick_cast_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_cast_entrypoints.cc
@@ -17,7 +17,7 @@
#include "mirror/class-inl.h"
#include "mirror/object-inl.h"
-namespace art HIDDEN {
+namespace art {
// Assignable test for code, won't throw. Null and equality tests already performed
extern "C" size_t artIsAssignableFromCode(mirror::Class* klass, mirror::Class* ref_class)
diff --git a/runtime/entrypoints/quick/quick_default_externs.h b/runtime/entrypoints/quick/quick_default_externs.h
index 5119b27..cb3caac 100644
--- a/runtime/entrypoints/quick/quick_default_externs.h
+++ b/runtime/entrypoints/quick/quick_default_externs.h
@@ -19,7 +19,7 @@
#include <cstdint>
-namespace art HIDDEN {
+namespace art {
namespace mirror {
class Array;
class Class;
diff --git a/runtime/entrypoints/quick/quick_default_init_entrypoints.h b/runtime/entrypoints/quick/quick_default_init_entrypoints.h
index 46840e6..ea07788 100644
--- a/runtime/entrypoints/quick/quick_default_init_entrypoints.h
+++ b/runtime/entrypoints/quick/quick_default_init_entrypoints.h
@@ -24,7 +24,7 @@
#include "quick_default_externs.h"
#include "quick_entrypoints.h"
-namespace art HIDDEN {
+namespace art {
static void DefaultInitEntryPoints(JniEntryPoints* jpoints,
QuickEntryPoints* qpoints,
diff --git a/runtime/entrypoints/quick/quick_deoptimization_entrypoints.cc b/runtime/entrypoints/quick/quick_deoptimization_entrypoints.cc
index 2906045..277bc7b 100644
--- a/runtime/entrypoints/quick/quick_deoptimization_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_deoptimization_entrypoints.cc
@@ -23,7 +23,7 @@
#include "runtime.h"
#include "thread.h"
-namespace art HIDDEN {
+namespace art {
NO_RETURN static void artDeoptimizeImpl(Thread* self,
DeoptimizationKind kind,
diff --git a/runtime/entrypoints/quick/quick_dexcache_entrypoints.cc b/runtime/entrypoints/quick/quick_dexcache_entrypoints.cc
index f29143f..9973d1a 100644
--- a/runtime/entrypoints/quick/quick_dexcache_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_dexcache_entrypoints.cc
@@ -32,7 +32,7 @@
#include "oat_file-inl.h"
#include "runtime.h"
-namespace art HIDDEN {
+namespace art {
static void StoreObjectInBss(ArtMethod* outer_method,
const OatFile* oat_file,
diff --git a/runtime/entrypoints/quick/quick_entrypoints.h b/runtime/entrypoints/quick/quick_entrypoints.h
index fe01424..0e73c63 100644
--- a/runtime/entrypoints/quick/quick_entrypoints.h
+++ b/runtime/entrypoints/quick/quick_entrypoints.h
@@ -27,7 +27,7 @@
#define QUICK_ENTRYPOINT_OFFSET(ptr_size, x) \
Thread::QuickEntryPointOffset<ptr_size>(OFFSETOF_MEMBER(QuickEntryPoints, x))
-namespace art HIDDEN {
+namespace art {
namespace mirror {
class Array;
diff --git a/runtime/entrypoints/quick/quick_entrypoints_enum.cc b/runtime/entrypoints/quick/quick_entrypoints_enum.cc
index 80d9313..5387e44 100644
--- a/runtime/entrypoints/quick/quick_entrypoints_enum.cc
+++ b/runtime/entrypoints/quick/quick_entrypoints_enum.cc
@@ -16,7 +16,7 @@
#include "quick_entrypoints_enum.h"
-namespace art HIDDEN {
+namespace art {
bool EntrypointRequiresStackMap(QuickEntrypointEnum trampoline) {
// Entrypoints that do not require a stackmap. In general leaf methods
diff --git a/runtime/entrypoints/quick/quick_entrypoints_enum.h b/runtime/entrypoints/quick/quick_entrypoints_enum.h
index c84ca20..017cba6 100644
--- a/runtime/entrypoints/quick/quick_entrypoints_enum.h
+++ b/runtime/entrypoints/quick/quick_entrypoints_enum.h
@@ -20,7 +20,7 @@
#include "quick_entrypoints.h"
#include "thread.h"
-namespace art HIDDEN {
+namespace art {
// Define an enum for the entrypoints. Names are prepended a 'kQuick'.
enum QuickEntrypointEnum { // NOLINT(whitespace/braces)
diff --git a/runtime/entrypoints/quick/quick_field_entrypoints.cc b/runtime/entrypoints/quick/quick_field_entrypoints.cc
index 39b21ea..edf58fa 100644
--- a/runtime/entrypoints/quick/quick_field_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_field_entrypoints.cc
@@ -26,7 +26,7 @@
#include "mirror/class-inl.h"
#include "mirror/object_reference.h"
-namespace art HIDDEN {
+namespace art {
// Fast path field resolution that can't initialize classes or throw exceptions.
inline ArtField* FindFieldFast(uint32_t field_idx,
diff --git a/runtime/entrypoints/quick/quick_fillarray_entrypoints.cc b/runtime/entrypoints/quick/quick_fillarray_entrypoints.cc
index b87d815..5b7fe0c 100644
--- a/runtime/entrypoints/quick/quick_fillarray_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_fillarray_entrypoints.cc
@@ -19,7 +19,7 @@
#include "entrypoints/entrypoint_utils.h"
#include "mirror/array.h"
-namespace art HIDDEN {
+namespace art {
/*
* Handle fill array data by copying appropriate part of dex file into array.
diff --git a/runtime/entrypoints/quick/quick_jni_entrypoints.cc b/runtime/entrypoints/quick/quick_jni_entrypoints.cc
index c9ec7a7..06c27b3 100644
--- a/runtime/entrypoints/quick/quick_jni_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_jni_entrypoints.cc
@@ -36,7 +36,7 @@
} \
}
-namespace art HIDDEN {
+namespace art {
extern "C" int artMethodExitHook(Thread* self,
ArtMethod* method,
diff --git a/runtime/entrypoints/quick/quick_lock_entrypoints.cc b/runtime/entrypoints/quick/quick_lock_entrypoints.cc
index 402f8f6..87286cf 100644
--- a/runtime/entrypoints/quick/quick_lock_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_lock_entrypoints.cc
@@ -18,7 +18,7 @@
#include "common_throws.h"
#include "mirror/object-inl.h"
-namespace art HIDDEN {
+namespace art {
extern "C" int artLockObjectFromCode(mirror::Object* obj, Thread* self)
NO_THREAD_SAFETY_ANALYSIS
diff --git a/runtime/entrypoints/quick/quick_string_builder_append_entrypoints.cc b/runtime/entrypoints/quick/quick_string_builder_append_entrypoints.cc
index 9e5fe1c..9afaf43 100644
--- a/runtime/entrypoints/quick/quick_string_builder_append_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_string_builder_append_entrypoints.cc
@@ -19,7 +19,7 @@
#include "string_builder_append.h"
#include "obj_ptr-inl.h"
-namespace art HIDDEN {
+namespace art {
extern "C" mirror::String* artStringBuilderAppend(uint32_t format,
const uint32_t* args,
diff --git a/runtime/entrypoints/quick/quick_thread_entrypoints.cc b/runtime/entrypoints/quick/quick_thread_entrypoints.cc
index 53e14d0..5dca58a 100644
--- a/runtime/entrypoints/quick/quick_thread_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_thread_entrypoints.cc
@@ -19,7 +19,7 @@
#include "runtime.h"
#include "thread-inl.h"
-namespace art HIDDEN {
+namespace art {
extern "C" void artDeoptimizeIfNeeded(Thread* self, uintptr_t result, bool is_ref)
REQUIRES_SHARED(Locks::mutator_lock_) {
diff --git a/runtime/entrypoints/quick/quick_throw_entrypoints.cc b/runtime/entrypoints/quick/quick_throw_entrypoints.cc
index 781f3e5..202b031 100644
--- a/runtime/entrypoints/quick/quick_throw_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_throw_entrypoints.cc
@@ -24,7 +24,7 @@
#include "thread.h"
#include "well_known_classes.h"
-namespace art HIDDEN {
+namespace art {
// Deliver an exception that's pending on thread helping set up a callee save frame on the way.
extern "C" NO_RETURN void artDeliverPendingExceptionFromCode(Thread* self)
diff --git a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
index d87388e..664cf62 100644
--- a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
@@ -58,7 +58,7 @@
#include "var_handles.h"
#include "well_known_classes.h"
-namespace art HIDDEN {
+namespace art {
extern "C" NO_RETURN void artDeoptimizeFromCompiledCode(DeoptimizationKind kind, Thread* self);
extern "C" NO_RETURN void artDeoptimize(Thread* self, bool skip_method_exit_callbacks);
@@ -943,8 +943,9 @@
// Returning reference argument at position `arg_pos` in Quick stack frame at address `sp`.
// NOTE: Only used for testing purposes.
-EXPORT extern "C" StackReference<mirror::Object>* artQuickGetProxyReferenceArgumentAt(
- size_t arg_pos, ArtMethod** sp) REQUIRES_SHARED(Locks::mutator_lock_) {
+extern "C" StackReference<mirror::Object>* artQuickGetProxyReferenceArgumentAt(size_t arg_pos,
+ ArtMethod** sp)
+ REQUIRES_SHARED(Locks::mutator_lock_) {
ArtMethod* proxy_method = *sp;
ArtMethod* non_proxy_method = proxy_method->GetInterfaceMethodIfProxy(kRuntimePointerSize);
CHECK(!non_proxy_method->IsStatic())
diff --git a/runtime/entrypoints/quick/quick_trampoline_entrypoints_test.cc b/runtime/entrypoints/quick/quick_trampoline_entrypoints_test.cc
index 14e5a7c..0f0fb69 100644
--- a/runtime/entrypoints/quick/quick_trampoline_entrypoints_test.cc
+++ b/runtime/entrypoints/quick/quick_trampoline_entrypoints_test.cc
@@ -22,7 +22,7 @@
#include "common_runtime_test.h"
#include "quick/quick_method_frame_info.h"
-namespace art HIDDEN {
+namespace art {
class QuickTrampolineEntrypointsTest : public CommonRuntimeTest {
protected:
diff --git a/runtime/native/dalvik_system_BaseDexClassLoader.cc b/runtime/native/dalvik_system_BaseDexClassLoader.cc
index f9a1aba..a4f702c 100644
--- a/runtime/native/dalvik_system_BaseDexClassLoader.cc
+++ b/runtime/native/dalvik_system_BaseDexClassLoader.cc
@@ -25,7 +25,7 @@
#include "nativehelper/jni_macros.h"
#include "thread-inl.h"
-namespace art HIDDEN {
+namespace art {
static bool append_string(Thread* self,
Handle<mirror::ObjectArray<mirror::String>> array,
diff --git a/runtime/native/dalvik_system_BaseDexClassLoader.h b/runtime/native/dalvik_system_BaseDexClassLoader.h
index 5a18b18..4ec03ef 100644
--- a/runtime/native/dalvik_system_BaseDexClassLoader.h
+++ b/runtime/native/dalvik_system_BaseDexClassLoader.h
@@ -20,9 +20,7 @@
#include <jni.h>
#include <unistd.h>
-#include "base/macros.h"
-
-namespace art HIDDEN {
+namespace art {
void register_dalvik_system_BaseDexClassLoader(JNIEnv* env);
diff --git a/runtime/native/dalvik_system_DexFile.cc b/runtime/native/dalvik_system_DexFile.cc
index f1c5d54..f602f73 100644
--- a/runtime/native/dalvik_system_DexFile.cc
+++ b/runtime/native/dalvik_system_DexFile.cc
@@ -62,7 +62,7 @@
#include <sys/system_properties.h>
#endif // ART_TARGET_ANDROID
-namespace art HIDDEN {
+namespace art {
// Should be the same as dalvik.system.DexFile.ENFORCE_READ_ONLY_JAVA_DCL
static constexpr uint64_t kEnforceReadOnlyJavaDcl = 218865702;
diff --git a/runtime/native/dalvik_system_DexFile.h b/runtime/native/dalvik_system_DexFile.h
index c22b83d..77d219d 100644
--- a/runtime/native/dalvik_system_DexFile.h
+++ b/runtime/native/dalvik_system_DexFile.h
@@ -20,9 +20,7 @@
#include <jni.h>
#include <unistd.h>
-#include "base/macros.h"
-
-namespace art HIDDEN {
+namespace art {
constexpr size_t kOatFileIndex = 0;
constexpr size_t kDexFileIndexStart = 1;
diff --git a/runtime/native/dalvik_system_VMDebug.cc b/runtime/native/dalvik_system_VMDebug.cc
index 137b04f..cf2b25d 100644
--- a/runtime/native/dalvik_system_VMDebug.cc
+++ b/runtime/native/dalvik_system_VMDebug.cc
@@ -51,7 +51,7 @@
#include "thread-inl.h"
#include "trace.h"
-namespace art HIDDEN {
+namespace art {
static jobjectArray VMDebug_getVmFeatureList(JNIEnv* env, jclass) {
ScopedObjectAccess soa(Thread::ForEnv(env));
diff --git a/runtime/native/dalvik_system_VMDebug.h b/runtime/native/dalvik_system_VMDebug.h
index 6d53fbe..b7eb8a8 100644
--- a/runtime/native/dalvik_system_VMDebug.h
+++ b/runtime/native/dalvik_system_VMDebug.h
@@ -19,9 +19,7 @@
#include <jni.h>
-#include "base/macros.h"
-
-namespace art HIDDEN {
+namespace art {
void register_dalvik_system_VMDebug(JNIEnv* env);
diff --git a/runtime/native/dalvik_system_VMRuntime.cc b/runtime/native/dalvik_system_VMRuntime.cc
index 3f71c31..f1561a2 100644
--- a/runtime/native/dalvik_system_VMRuntime.cc
+++ b/runtime/native/dalvik_system_VMRuntime.cc
@@ -66,7 +66,7 @@
#include "thread-inl.h"
#include "thread_list.h"
-namespace art HIDDEN {
+namespace art {
using android::base::StringPrintf;
diff --git a/runtime/native/dalvik_system_VMRuntime.h b/runtime/native/dalvik_system_VMRuntime.h
index 10f41ad..795caa5 100644
--- a/runtime/native/dalvik_system_VMRuntime.h
+++ b/runtime/native/dalvik_system_VMRuntime.h
@@ -19,9 +19,7 @@
#include <jni.h>
-#include "base/macros.h"
-
-namespace art HIDDEN {
+namespace art {
void register_dalvik_system_VMRuntime(JNIEnv* env);
diff --git a/runtime/native/dalvik_system_VMStack.cc b/runtime/native/dalvik_system_VMStack.cc
index 599bdb9..596b2eb 100644
--- a/runtime/native/dalvik_system_VMStack.cc
+++ b/runtime/native/dalvik_system_VMStack.cc
@@ -32,7 +32,7 @@
#include "scoped_thread_state_change-inl.h"
#include "thread_list.h"
-namespace art HIDDEN {
+namespace art {
template <typename T,
typename ResultT =
diff --git a/runtime/native/dalvik_system_VMStack.h b/runtime/native/dalvik_system_VMStack.h
index c7a62ad..5638f99 100644
--- a/runtime/native/dalvik_system_VMStack.h
+++ b/runtime/native/dalvik_system_VMStack.h
@@ -19,9 +19,7 @@
#include <jni.h>
-#include "base/macros.h"
-
-namespace art HIDDEN {
+namespace art {
void register_dalvik_system_VMStack(JNIEnv* env);
diff --git a/runtime/native/dalvik_system_ZygoteHooks.cc b/runtime/native/dalvik_system_ZygoteHooks.cc
index cc47032..dd44e2e 100644
--- a/runtime/native/dalvik_system_ZygoteHooks.cc
+++ b/runtime/native/dalvik_system_ZygoteHooks.cc
@@ -47,7 +47,7 @@
#include <sys/resource.h>
-namespace art HIDDEN {
+namespace art {
// Set to true to always determine the non-debuggable classes even if we would not allow a debugger
// to actually attach.
diff --git a/runtime/native/dalvik_system_ZygoteHooks.h b/runtime/native/dalvik_system_ZygoteHooks.h
index fbd14c0..ca0658d 100644
--- a/runtime/native/dalvik_system_ZygoteHooks.h
+++ b/runtime/native/dalvik_system_ZygoteHooks.h
@@ -19,9 +19,7 @@
#include <jni.h>
-#include "base/macros.h"
-
-namespace art HIDDEN {
+namespace art {
void register_dalvik_system_ZygoteHooks(JNIEnv* env);
diff --git a/runtime/native/java_lang_Class.cc b/runtime/native/java_lang_Class.cc
index 1dc74e0..2abc493 100644
--- a/runtime/native/java_lang_Class.cc
+++ b/runtime/native/java_lang_Class.cc
@@ -56,7 +56,7 @@
#include "scoped_thread_state_change-inl.h"
#include "well_known_classes-inl.h"
-namespace art HIDDEN {
+namespace art {
static std::function<hiddenapi::AccessContext()> GetHiddenapiAccessContextFunction(Thread* self) {
return [=]() REQUIRES_SHARED(Locks::mutator_lock_) {
diff --git a/runtime/native/java_lang_Class.h b/runtime/native/java_lang_Class.h
index aaa9b66..8f769c3 100644
--- a/runtime/native/java_lang_Class.h
+++ b/runtime/native/java_lang_Class.h
@@ -19,9 +19,7 @@
#include <jni.h>
-#include "base/macros.h"
-
-namespace art HIDDEN {
+namespace art {
void register_java_lang_Class(JNIEnv* env);
diff --git a/runtime/native/java_lang_Object.cc b/runtime/native/java_lang_Object.cc
index 5649b2c..8fc10d1 100644
--- a/runtime/native/java_lang_Object.cc
+++ b/runtime/native/java_lang_Object.cc
@@ -24,7 +24,7 @@
#include "native_util.h"
#include "scoped_fast_native_object_access-inl.h"
-namespace art HIDDEN {
+namespace art {
static jobject Object_internalClone(JNIEnv* env, jobject java_this) {
ScopedFastNativeObjectAccess soa(env);
diff --git a/runtime/native/java_lang_Object.h b/runtime/native/java_lang_Object.h
index 1ea2c05..c860571 100644
--- a/runtime/native/java_lang_Object.h
+++ b/runtime/native/java_lang_Object.h
@@ -19,9 +19,7 @@
#include <jni.h>
-#include "base/macros.h"
-
-namespace art HIDDEN {
+namespace art {
void register_java_lang_Object(JNIEnv* env);
diff --git a/runtime/native/java_lang_StackStreamFactory.cc b/runtime/native/java_lang_StackStreamFactory.cc
index 24d9030..f876c10 100644
--- a/runtime/native/java_lang_StackStreamFactory.cc
+++ b/runtime/native/java_lang_StackStreamFactory.cc
@@ -23,7 +23,7 @@
#include "scoped_fast_native_object_access-inl.h"
#include "thread.h"
-namespace art HIDDEN {
+namespace art {
static jobject StackStreamFactory_nativeGetStackAnchor(JNIEnv* env, jclass) {
ScopedFastNativeObjectAccess soa(env);
diff --git a/runtime/native/java_lang_StackStreamFactory.h b/runtime/native/java_lang_StackStreamFactory.h
index 31b3c95..2216871 100644
--- a/runtime/native/java_lang_StackStreamFactory.h
+++ b/runtime/native/java_lang_StackStreamFactory.h
@@ -19,9 +19,7 @@
#include <jni.h>
-#include "base/macros.h"
-
-namespace art HIDDEN {
+namespace art {
void register_java_lang_StackStreamFactory(JNIEnv* env);
diff --git a/runtime/native/java_lang_String.cc b/runtime/native/java_lang_String.cc
index 1ba0028..f70a188 100644
--- a/runtime/native/java_lang_String.cc
+++ b/runtime/native/java_lang_String.cc
@@ -31,7 +31,7 @@
#include "scoped_thread_state_change-inl.h"
#include "verify_object.h"
-namespace art HIDDEN {
+namespace art {
static jchar String_charAt(JNIEnv* env, jobject java_this, jint index) {
ScopedFastNativeObjectAccess soa(env);
diff --git a/runtime/native/java_lang_String.h b/runtime/native/java_lang_String.h
index a78fdce..357eb3d 100644
--- a/runtime/native/java_lang_String.h
+++ b/runtime/native/java_lang_String.h
@@ -19,9 +19,7 @@
#include <jni.h>
-#include "base/macros.h"
-
-namespace art HIDDEN {
+namespace art {
void register_java_lang_String(JNIEnv* env);
diff --git a/runtime/native/java_lang_StringFactory.cc b/runtime/native/java_lang_StringFactory.cc
index e6c03db..2fbebc0 100644
--- a/runtime/native/java_lang_StringFactory.cc
+++ b/runtime/native/java_lang_StringFactory.cc
@@ -28,7 +28,7 @@
#include "scoped_fast_native_object_access-inl.h"
#include "scoped_thread_state_change-inl.h"
-namespace art HIDDEN {
+namespace art {
static jstring StringFactory_newStringFromBytes(JNIEnv* env, jclass, jbyteArray java_data,
jint high, jint offset, jint byte_count) {
diff --git a/runtime/native/java_lang_StringFactory.h b/runtime/native/java_lang_StringFactory.h
index cdc19df..c476ad3 100644
--- a/runtime/native/java_lang_StringFactory.h
+++ b/runtime/native/java_lang_StringFactory.h
@@ -19,9 +19,7 @@
#include <jni.h>
-#include "base/macros.h"
-
-namespace art HIDDEN {
+namespace art {
void register_java_lang_StringFactory(JNIEnv* env);
diff --git a/runtime/native/java_lang_System.cc b/runtime/native/java_lang_System.cc
index 203d98d..63cbd2c 100644
--- a/runtime/native/java_lang_System.cc
+++ b/runtime/native/java_lang_System.cc
@@ -29,7 +29,7 @@
#include "native_util.h"
#include "scoped_fast_native_object_access-inl.h"
-namespace art HIDDEN {
+namespace art {
/*
* We make guarantees about the atomicity of accesses to primitive variables. These guarantees
diff --git a/runtime/native/java_lang_System.h b/runtime/native/java_lang_System.h
index a529727..e371fa5 100644
--- a/runtime/native/java_lang_System.h
+++ b/runtime/native/java_lang_System.h
@@ -19,9 +19,7 @@
#include <jni.h>
-#include "base/macros.h"
-
-namespace art HIDDEN {
+namespace art {
void register_java_lang_System(JNIEnv* env);
diff --git a/runtime/native/java_lang_Thread.cc b/runtime/native/java_lang_Thread.cc
index 65e3009..fd67a0a 100644
--- a/runtime/native/java_lang_Thread.cc
+++ b/runtime/native/java_lang_Thread.cc
@@ -29,7 +29,7 @@
#include "thread_list.h"
#include "verify_object.h"
-namespace art HIDDEN {
+namespace art {
static jobject Thread_currentThread(JNIEnv* env, jclass) {
ScopedFastNativeObjectAccess soa(env);
diff --git a/runtime/native/java_lang_Thread.h b/runtime/native/java_lang_Thread.h
index ef880a9..7700ce2 100644
--- a/runtime/native/java_lang_Thread.h
+++ b/runtime/native/java_lang_Thread.h
@@ -19,9 +19,7 @@
#include <jni.h>
-#include "base/macros.h"
-
-namespace art HIDDEN {
+namespace art {
void register_java_lang_Thread(JNIEnv* env);
diff --git a/runtime/native/java_lang_Throwable.cc b/runtime/native/java_lang_Throwable.cc
index 091ad03..b89e287 100644
--- a/runtime/native/java_lang_Throwable.cc
+++ b/runtime/native/java_lang_Throwable.cc
@@ -23,7 +23,7 @@
#include "scoped_fast_native_object_access-inl.h"
#include "thread.h"
-namespace art HIDDEN {
+namespace art {
static jobject Throwable_nativeFillInStackTrace(JNIEnv* env, jclass) {
ScopedFastNativeObjectAccess soa(env);
diff --git a/runtime/native/java_lang_Throwable.h b/runtime/native/java_lang_Throwable.h
index 6758e48..f9aea84 100644
--- a/runtime/native/java_lang_Throwable.h
+++ b/runtime/native/java_lang_Throwable.h
@@ -19,9 +19,7 @@
#include <jni.h>
-#include "base/macros.h"
-
-namespace art HIDDEN {
+namespace art {
void register_java_lang_Throwable(JNIEnv* env);
diff --git a/runtime/native/java_lang_VMClassLoader.cc b/runtime/native/java_lang_VMClassLoader.cc
index ba1fde0..4dad46f 100644
--- a/runtime/native/java_lang_VMClassLoader.cc
+++ b/runtime/native/java_lang_VMClassLoader.cc
@@ -38,7 +38,7 @@
#include "thread-inl.h"
#include "well_known_classes-inl.h"
-namespace art HIDDEN {
+namespace art {
// A class so we can be friends with ClassLinker and access internal methods.
class VMClassLoader {
diff --git a/runtime/native/java_lang_VMClassLoader.h b/runtime/native/java_lang_VMClassLoader.h
index adf0c0a..bf8d94f 100644
--- a/runtime/native/java_lang_VMClassLoader.h
+++ b/runtime/native/java_lang_VMClassLoader.h
@@ -19,9 +19,7 @@
#include <jni.h>
-#include "base/macros.h"
-
-namespace art HIDDEN {
+namespace art {
void register_java_lang_VMClassLoader(JNIEnv* env);
diff --git a/runtime/native/java_lang_invoke_MethodHandle.cc b/runtime/native/java_lang_invoke_MethodHandle.cc
index 819656f..5309a28 100644
--- a/runtime/native/java_lang_invoke_MethodHandle.cc
+++ b/runtime/native/java_lang_invoke_MethodHandle.cc
@@ -27,7 +27,7 @@
#include "native_util.h"
#include "scoped_thread_state_change-inl.h"
-namespace art HIDDEN {
+namespace art {
static void MethodHandle_invokeExactWithFrame(JNIEnv* env, jobject thiz, jobject arguments) {
ScopedObjectAccess soa(env);
diff --git a/runtime/native/java_lang_invoke_MethodHandle.h b/runtime/native/java_lang_invoke_MethodHandle.h
index f46f324..1f38ac7 100644
--- a/runtime/native/java_lang_invoke_MethodHandle.h
+++ b/runtime/native/java_lang_invoke_MethodHandle.h
@@ -19,9 +19,7 @@
#include <jni.h>
-#include "base/macros.h"
-
-namespace art HIDDEN {
+namespace art {
void register_java_lang_invoke_MethodHandle(JNIEnv* env);
diff --git a/runtime/native/java_lang_invoke_MethodHandleImpl.cc b/runtime/native/java_lang_invoke_MethodHandleImpl.cc
index ccd3370..00ce01f 100644
--- a/runtime/native/java_lang_invoke_MethodHandleImpl.cc
+++ b/runtime/native/java_lang_invoke_MethodHandleImpl.cc
@@ -28,7 +28,7 @@
#include "runtime.h"
#include "scoped_thread_state_change-inl.h"
-namespace art HIDDEN {
+namespace art {
static jobject MethodHandleImpl_getMemberInternal(JNIEnv* env, jobject thiz) {
ScopedObjectAccess soa(env);
diff --git a/runtime/native/java_lang_invoke_MethodHandleImpl.h b/runtime/native/java_lang_invoke_MethodHandleImpl.h
index 49d4c2c..0e50371 100644
--- a/runtime/native/java_lang_invoke_MethodHandleImpl.h
+++ b/runtime/native/java_lang_invoke_MethodHandleImpl.h
@@ -19,9 +19,7 @@
#include <jni.h>
-#include "base/macros.h"
-
-namespace art HIDDEN {
+namespace art {
void register_java_lang_invoke_MethodHandleImpl(JNIEnv* env);
diff --git a/runtime/native/java_lang_ref_FinalizerReference.cc b/runtime/native/java_lang_ref_FinalizerReference.cc
index 52f6f73..535b243 100644
--- a/runtime/native/java_lang_ref_FinalizerReference.cc
+++ b/runtime/native/java_lang_ref_FinalizerReference.cc
@@ -26,7 +26,7 @@
#include "native_util.h"
#include "scoped_fast_native_object_access-inl.h"
-namespace art HIDDEN {
+namespace art {
static jboolean FinalizerReference_makeCircularListIfUnenqueued(JNIEnv* env, jobject javaThis) {
ScopedFastNativeObjectAccess soa(env);
diff --git a/runtime/native/java_lang_ref_FinalizerReference.h b/runtime/native/java_lang_ref_FinalizerReference.h
index 13d1a12..848a7ad 100644
--- a/runtime/native/java_lang_ref_FinalizerReference.h
+++ b/runtime/native/java_lang_ref_FinalizerReference.h
@@ -19,9 +19,7 @@
#include <jni.h>
-#include "base/macros.h"
-
-namespace art HIDDEN {
+namespace art {
void register_java_lang_ref_FinalizerReference(JNIEnv* env);
diff --git a/runtime/native/java_lang_ref_Reference.cc b/runtime/native/java_lang_ref_Reference.cc
index 4c411c8..bd7235e 100644
--- a/runtime/native/java_lang_ref_Reference.cc
+++ b/runtime/native/java_lang_ref_Reference.cc
@@ -26,7 +26,7 @@
#include "native_util.h"
#include "scoped_fast_native_object_access-inl.h"
-namespace art HIDDEN {
+namespace art {
static jobject Reference_getReferent(JNIEnv* env, jobject javaThis) {
ScopedFastNativeObjectAccess soa(env);
diff --git a/runtime/native/java_lang_ref_Reference.h b/runtime/native/java_lang_ref_Reference.h
index cc75069..0cbf116 100644
--- a/runtime/native/java_lang_ref_Reference.h
+++ b/runtime/native/java_lang_ref_Reference.h
@@ -19,9 +19,7 @@
#include <jni.h>
-#include "base/macros.h"
-
-namespace art HIDDEN {
+namespace art {
void register_java_lang_ref_Reference(JNIEnv* env);
diff --git a/runtime/native/java_lang_reflect_Array.cc b/runtime/native/java_lang_reflect_Array.cc
index 9ac6e61..ff94593 100644
--- a/runtime/native/java_lang_reflect_Array.cc
+++ b/runtime/native/java_lang_reflect_Array.cc
@@ -29,7 +29,7 @@
#include "native_util.h"
#include "scoped_fast_native_object_access-inl.h"
-namespace art HIDDEN {
+namespace art {
static jobject Array_createMultiArray(
JNIEnv* env, jclass, jclass javaElementClass, jintArray javaDimArray) {
diff --git a/runtime/native/java_lang_reflect_Array.h b/runtime/native/java_lang_reflect_Array.h
index 35b87b7..805bf79 100644
--- a/runtime/native/java_lang_reflect_Array.h
+++ b/runtime/native/java_lang_reflect_Array.h
@@ -19,9 +19,7 @@
#include <jni.h>
-#include "base/macros.h"
-
-namespace art HIDDEN {
+namespace art {
void register_java_lang_reflect_Array(JNIEnv* env);
diff --git a/runtime/native/java_lang_reflect_Constructor.cc b/runtime/native/java_lang_reflect_Constructor.cc
index f9278ab..98afddc 100644
--- a/runtime/native/java_lang_reflect_Constructor.cc
+++ b/runtime/native/java_lang_reflect_Constructor.cc
@@ -34,7 +34,7 @@
#include "reflection.h"
#include "scoped_fast_native_object_access-inl.h"
-namespace art HIDDEN {
+namespace art {
static jobjectArray Constructor_getExceptionTypes(JNIEnv* env, jobject javaMethod) {
ScopedFastNativeObjectAccess soa(env);
diff --git a/runtime/native/java_lang_reflect_Constructor.h b/runtime/native/java_lang_reflect_Constructor.h
index 9c36ef4..7baae97 100644
--- a/runtime/native/java_lang_reflect_Constructor.h
+++ b/runtime/native/java_lang_reflect_Constructor.h
@@ -19,9 +19,7 @@
#include <jni.h>
-#include "base/macros.h"
-
-namespace art HIDDEN {
+namespace art {
void register_java_lang_reflect_Constructor(JNIEnv* env);
diff --git a/runtime/native/java_lang_reflect_Executable.cc b/runtime/native/java_lang_reflect_Executable.cc
index 3f3b648..87c9f6c 100644
--- a/runtime/native/java_lang_reflect_Executable.cc
+++ b/runtime/native/java_lang_reflect_Executable.cc
@@ -35,7 +35,7 @@
#include "scoped_fast_native_object_access-inl.h"
#include "well_known_classes.h"
-namespace art HIDDEN {
+namespace art {
using android::base::StringPrintf;
diff --git a/runtime/native/java_lang_reflect_Executable.h b/runtime/native/java_lang_reflect_Executable.h
index 05b0a23..0cfed62 100644
--- a/runtime/native/java_lang_reflect_Executable.h
+++ b/runtime/native/java_lang_reflect_Executable.h
@@ -19,9 +19,7 @@
#include <jni.h>
-#include "base/macros.h"
-
-namespace art HIDDEN {
+namespace art {
void register_java_lang_reflect_Executable(JNIEnv* env);
diff --git a/runtime/native/java_lang_reflect_Field.cc b/runtime/native/java_lang_reflect_Field.cc
index 622b514..f2603d4 100644
--- a/runtime/native/java_lang_reflect_Field.cc
+++ b/runtime/native/java_lang_reflect_Field.cc
@@ -37,7 +37,7 @@
#include "scoped_fast_native_object_access-inl.h"
#include "well_known_classes.h"
-namespace art HIDDEN {
+namespace art {
using android::base::StringPrintf;
diff --git a/runtime/native/java_lang_reflect_Field.h b/runtime/native/java_lang_reflect_Field.h
index b5368b9..1739711 100644
--- a/runtime/native/java_lang_reflect_Field.h
+++ b/runtime/native/java_lang_reflect_Field.h
@@ -19,9 +19,7 @@
#include <jni.h>
-#include "base/macros.h"
-
-namespace art HIDDEN {
+namespace art {
void register_java_lang_reflect_Field(JNIEnv* env);
diff --git a/runtime/native/java_lang_reflect_Method.cc b/runtime/native/java_lang_reflect_Method.cc
index 8cbc070..5f02ad0 100644
--- a/runtime/native/java_lang_reflect_Method.cc
+++ b/runtime/native/java_lang_reflect_Method.cc
@@ -32,7 +32,7 @@
#include "reflection.h"
#include "scoped_fast_native_object_access-inl.h"
-namespace art HIDDEN {
+namespace art {
static jobject Method_getDefaultValue(JNIEnv* env, jobject javaMethod) {
ScopedFastNativeObjectAccess soa(env);
diff --git a/runtime/native/java_lang_reflect_Method.h b/runtime/native/java_lang_reflect_Method.h
index 4b48ced..3a93cd0 100644
--- a/runtime/native/java_lang_reflect_Method.h
+++ b/runtime/native/java_lang_reflect_Method.h
@@ -19,9 +19,7 @@
#include <jni.h>
-#include "base/macros.h"
-
-namespace art HIDDEN {
+namespace art {
void register_java_lang_reflect_Method(JNIEnv* env);
diff --git a/runtime/native/java_lang_reflect_Parameter.cc b/runtime/native/java_lang_reflect_Parameter.cc
index fe9e4e3..263a567 100644
--- a/runtime/native/java_lang_reflect_Parameter.cc
+++ b/runtime/native/java_lang_reflect_Parameter.cc
@@ -28,7 +28,7 @@
#include "native_util.h"
#include "scoped_fast_native_object_access-inl.h"
-namespace art HIDDEN {
+namespace art {
using android::base::StringPrintf;
diff --git a/runtime/native/java_lang_reflect_Parameter.h b/runtime/native/java_lang_reflect_Parameter.h
index 97873fb..f6322b1 100644
--- a/runtime/native/java_lang_reflect_Parameter.h
+++ b/runtime/native/java_lang_reflect_Parameter.h
@@ -19,9 +19,7 @@
#include <jni.h>
-#include "base/macros.h"
-
-namespace art HIDDEN {
+namespace art {
void register_java_lang_reflect_Parameter(JNIEnv* env);
diff --git a/runtime/native/java_lang_reflect_Proxy.cc b/runtime/native/java_lang_reflect_Proxy.cc
index a89f827..f723ed2 100644
--- a/runtime/native/java_lang_reflect_Proxy.cc
+++ b/runtime/native/java_lang_reflect_Proxy.cc
@@ -27,7 +27,7 @@
#include "scoped_fast_native_object_access-inl.h"
#include "verify_object.h"
-namespace art HIDDEN {
+namespace art {
static jclass Proxy_generateProxy(JNIEnv* env, jclass, jstring name, jobjectArray interfaces,
jobject loader, jobjectArray methods, jobjectArray throws) {
diff --git a/runtime/native/java_lang_reflect_Proxy.h b/runtime/native/java_lang_reflect_Proxy.h
index e6b3f24..e25f0f7 100644
--- a/runtime/native/java_lang_reflect_Proxy.h
+++ b/runtime/native/java_lang_reflect_Proxy.h
@@ -19,9 +19,7 @@
#include <jni.h>
-#include "base/macros.h"
-
-namespace art HIDDEN {
+namespace art {
void register_java_lang_reflect_Proxy(JNIEnv* env);
diff --git a/runtime/native/java_util_concurrent_atomic_AtomicLong.cc b/runtime/native/java_util_concurrent_atomic_AtomicLong.cc
index 3f4c609..fa288ed 100644
--- a/runtime/native/java_util_concurrent_atomic_AtomicLong.cc
+++ b/runtime/native/java_util_concurrent_atomic_AtomicLong.cc
@@ -24,7 +24,7 @@
#include "jni/jni_internal.h"
#include "native_util.h"
-namespace art HIDDEN {
+namespace art {
static jboolean AtomicLong_VMSupportsCS8(JNIEnv*, jclass) {
return QuasiAtomic::LongAtomicsUseMutexes(kRuntimeISA) ? JNI_FALSE : JNI_TRUE;
diff --git a/runtime/native/java_util_concurrent_atomic_AtomicLong.h b/runtime/native/java_util_concurrent_atomic_AtomicLong.h
index de442ed..990dc86 100644
--- a/runtime/native/java_util_concurrent_atomic_AtomicLong.h
+++ b/runtime/native/java_util_concurrent_atomic_AtomicLong.h
@@ -19,9 +19,7 @@
#include <jni.h>
-#include "base/macros.h"
-
-namespace art HIDDEN {
+namespace art {
void register_java_util_concurrent_atomic_AtomicLong(JNIEnv* env);
diff --git a/runtime/native/jdk_internal_misc_Unsafe.cc b/runtime/native/jdk_internal_misc_Unsafe.cc
index 10c6b2d..9b2021d 100644
--- a/runtime/native/jdk_internal_misc_Unsafe.cc
+++ b/runtime/native/jdk_internal_misc_Unsafe.cc
@@ -36,7 +36,7 @@
#include "scoped_fast_native_object_access-inl.h"
#include "well_known_classes-inl.h"
-namespace art HIDDEN {
+namespace art {
namespace {
// Checks a JNI argument `size` fits inside a size_t and throws a RuntimeException if not (see
diff --git a/runtime/native/jdk_internal_misc_Unsafe.h b/runtime/native/jdk_internal_misc_Unsafe.h
index 61b377b..779cd5f 100644
--- a/runtime/native/jdk_internal_misc_Unsafe.h
+++ b/runtime/native/jdk_internal_misc_Unsafe.h
@@ -19,9 +19,7 @@
#include <jni.h>
-#include "base/macros.h"
-
-namespace art HIDDEN {
+namespace art {
void register_jdk_internal_misc_Unsafe(JNIEnv* env);
diff --git a/runtime/native/libcore_io_Memory.cc b/runtime/native/libcore_io_Memory.cc
index 66a16ed..5e38280 100644
--- a/runtime/native/libcore_io_Memory.cc
+++ b/runtime/native/libcore_io_Memory.cc
@@ -25,7 +25,7 @@
#include "nativehelper/scoped_primitive_array.h"
#include "scoped_fast_native_object_access-inl.h"
-namespace art HIDDEN {
+namespace art {
// Use packed structures for access to unaligned data on targets with alignment restrictions.
// The compiler will generate appropriate code to access these structures without
diff --git a/runtime/native/libcore_io_Memory.h b/runtime/native/libcore_io_Memory.h
index bf60986..8c8a2ec 100644
--- a/runtime/native/libcore_io_Memory.h
+++ b/runtime/native/libcore_io_Memory.h
@@ -19,9 +19,7 @@
#include <jni.h>
-#include "base/macros.h"
-
-namespace art HIDDEN {
+namespace art {
void register_libcore_io_Memory(JNIEnv* env);
diff --git a/runtime/native/libcore_util_CharsetUtils.cc b/runtime/native/libcore_util_CharsetUtils.cc
index b497f10..46f8993 100644
--- a/runtime/native/libcore_util_CharsetUtils.cc
+++ b/runtime/native/libcore_util_CharsetUtils.cc
@@ -28,7 +28,7 @@
#include "nativehelper/jni_macros.h"
#include "scoped_fast_native_object_access-inl.h"
-namespace art HIDDEN {
+namespace art {
static void CharsetUtils_asciiBytesToChars(JNIEnv* env, jclass, jbyteArray javaBytes, jint offset,
jint length, jcharArray javaChars) {
diff --git a/runtime/native/libcore_util_CharsetUtils.h b/runtime/native/libcore_util_CharsetUtils.h
index eaafcab..3518bdb 100644
--- a/runtime/native/libcore_util_CharsetUtils.h
+++ b/runtime/native/libcore_util_CharsetUtils.h
@@ -19,9 +19,7 @@
#include <jni.h>
-#include "base/macros.h"
-
-namespace art HIDDEN {
+namespace art {
void register_libcore_util_CharsetUtils(JNIEnv* env);
diff --git a/runtime/native/native_util.h b/runtime/native/native_util.h
index f399359..784dba3 100644
--- a/runtime/native/native_util.h
+++ b/runtime/native/native_util.h
@@ -23,7 +23,7 @@
#include "base/macros.h"
#include "nativehelper/scoped_local_ref.h"
-namespace art HIDDEN {
+namespace art {
ALWAYS_INLINE inline void RegisterNativeMethodsInternal(JNIEnv* env,
const char* jni_class_name,
diff --git a/runtime/native/org_apache_harmony_dalvik_ddmc_DdmServer.cc b/runtime/native/org_apache_harmony_dalvik_ddmc_DdmServer.cc
index b2e94f9..419aed8 100644
--- a/runtime/native/org_apache_harmony_dalvik_ddmc_DdmServer.cc
+++ b/runtime/native/org_apache_harmony_dalvik_ddmc_DdmServer.cc
@@ -26,7 +26,7 @@
#include "nativehelper/scoped_primitive_array.h"
#include "scoped_fast_native_object_access-inl.h"
-namespace art HIDDEN {
+namespace art {
static void DdmServer_nativeSendChunk(JNIEnv* env, jclass, jint type,
jbyteArray javaData, jint offset, jint length) {
diff --git a/runtime/native/org_apache_harmony_dalvik_ddmc_DdmServer.h b/runtime/native/org_apache_harmony_dalvik_ddmc_DdmServer.h
index fc5cfc9..9a4645c 100644
--- a/runtime/native/org_apache_harmony_dalvik_ddmc_DdmServer.h
+++ b/runtime/native/org_apache_harmony_dalvik_ddmc_DdmServer.h
@@ -19,9 +19,7 @@
#include <jni.h>
-#include "base/macros.h"
-
-namespace art HIDDEN {
+namespace art {
void register_org_apache_harmony_dalvik_ddmc_DdmServer(JNIEnv* env);
diff --git a/runtime/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.cc b/runtime/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.cc
index 6da4529..f20cd28 100644
--- a/runtime/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.cc
+++ b/runtime/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.cc
@@ -31,7 +31,7 @@
#include "scoped_fast_native_object_access-inl.h"
#include "thread_list.h"
-namespace art HIDDEN {
+namespace art {
static void DdmVmInternal_setRecentAllocationsTrackingEnabled(JNIEnv*, jclass, jboolean enable) {
Dbg::SetAllocTrackingEnabled(enable);
diff --git a/runtime/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.h b/runtime/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.h
index 5484f36..736e4c8 100644
--- a/runtime/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.h
+++ b/runtime/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.h
@@ -19,9 +19,7 @@
#include <jni.h>
-#include "base/macros.h"
-
-namespace art HIDDEN {
+namespace art {
void register_org_apache_harmony_dalvik_ddmc_DdmVmInternal(JNIEnv* env);
diff --git a/runtime/native/scoped_fast_native_object_access-inl.h b/runtime/native/scoped_fast_native_object_access-inl.h
index cd1a0b2..0b8ad11 100644
--- a/runtime/native/scoped_fast_native_object_access-inl.h
+++ b/runtime/native/scoped_fast_native_object_access-inl.h
@@ -22,7 +22,7 @@
#include "art_method.h"
#include "scoped_thread_state_change-inl.h"
-namespace art HIDDEN {
+namespace art {
inline ScopedFastNativeObjectAccess::ScopedFastNativeObjectAccess(JNIEnv* env)
: ScopedObjectAccessAlreadyRunnable(env) {
diff --git a/runtime/native/scoped_fast_native_object_access.h b/runtime/native/scoped_fast_native_object_access.h
index a3b01d7..6a9365d 100644
--- a/runtime/native/scoped_fast_native_object_access.h
+++ b/runtime/native/scoped_fast_native_object_access.h
@@ -19,10 +19,9 @@
#include <jni.h>
-#include "base/macros.h"
#include "scoped_thread_state_change.h"
-namespace art HIDDEN {
+namespace art {
// Variant of ScopedObjectAccess that does no runnable transitions. Should only be used by "fast"
// JNI methods.
diff --git a/runtime/native/string_array_utils.h b/runtime/native/string_array_utils.h
index f1fbe54..41d5093 100644
--- a/runtime/native/string_array_utils.h
+++ b/runtime/native/string_array_utils.h
@@ -17,14 +17,13 @@
#ifndef ART_RUNTIME_NATIVE_STRING_ARRAY_UTILS_H_
#define ART_RUNTIME_NATIVE_STRING_ARRAY_UTILS_H_
-#include "base/macros.h"
#include "base/locks.h"
#include "class_root-inl.h"
#include "handle_scope-inl.h"
#include "mirror/object_array-alloc-inl.h"
#include "mirror/string.h"
-namespace art HIDDEN {
+namespace art {
namespace detail {
diff --git a/runtime/native/sun_misc_Unsafe.cc b/runtime/native/sun_misc_Unsafe.cc
index 573b5a9..f1e47ee 100644
--- a/runtime/native/sun_misc_Unsafe.cc
+++ b/runtime/native/sun_misc_Unsafe.cc
@@ -36,7 +36,7 @@
#include "scoped_fast_native_object_access-inl.h"
#include "well_known_classes-inl.h"
-namespace art HIDDEN {
+namespace art {
static jboolean Unsafe_compareAndSwapInt(JNIEnv* env, jobject, jobject javaObj, jlong offset,
jint expectedValue, jint newValue) {
diff --git a/runtime/native/sun_misc_Unsafe.h b/runtime/native/sun_misc_Unsafe.h
index fe120b5..93194f4 100644
--- a/runtime/native/sun_misc_Unsafe.h
+++ b/runtime/native/sun_misc_Unsafe.h
@@ -19,9 +19,7 @@
#include <jni.h>
-#include "base/macros.h"
-
-namespace art HIDDEN {
+namespace art {
void register_sun_misc_Unsafe(JNIEnv* env);