diff options
author | 2022-11-16 09:04:28 +0000 | |
---|---|---|
committer | 2022-11-16 09:37:21 +0000 | |
commit | 76e87957aa6a2899f3146ab7711a67bad5c5a9ac (patch) | |
tree | 4fedb77762410a4b9b2d8eae263c6b1efc5747d6 | |
parent | 79c4f832be41c6e42d95a98966fbcc619a39a810 (diff) |
Make compiler/jni/ symbols hidden.
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Change-Id: I04dc99e1491219442ba128f57a08112ae4783b92
-rw-r--r-- | compiler/jni/jni_cfi_test.cc | 3 | ||||
-rw-r--r-- | compiler/jni/jni_compiler_test.cc | 4 | ||||
-rw-r--r-- | compiler/jni/quick/arm/calling_convention_arm.cc | 2 | ||||
-rw-r--r-- | compiler/jni/quick/arm/calling_convention_arm.h | 3 | ||||
-rw-r--r-- | compiler/jni/quick/arm64/calling_convention_arm64.cc | 2 | ||||
-rw-r--r-- | compiler/jni/quick/arm64/calling_convention_arm64.h | 3 | ||||
-rw-r--r-- | compiler/jni/quick/calling_convention.cc | 2 | ||||
-rw-r--r-- | compiler/jni/quick/calling_convention.h | 3 | ||||
-rw-r--r-- | compiler/jni/quick/jni_compiler.cc | 2 | ||||
-rw-r--r-- | compiler/jni/quick/jni_compiler.h | 3 | ||||
-rw-r--r-- | compiler/jni/quick/x86/calling_convention_x86.cc | 2 | ||||
-rw-r--r-- | compiler/jni/quick/x86/calling_convention_x86.h | 3 | ||||
-rw-r--r-- | compiler/jni/quick/x86_64/calling_convention_x86_64.cc | 2 | ||||
-rw-r--r-- | compiler/jni/quick/x86_64/calling_convention_x86_64.h | 3 |
14 files changed, 23 insertions, 14 deletions
diff --git a/compiler/jni/jni_cfi_test.cc b/compiler/jni/jni_cfi_test.cc index 368b87c9cd..70cf2d4eb0 100644 --- a/compiler/jni/jni_cfi_test.cc +++ b/compiler/jni/jni_cfi_test.cc @@ -20,6 +20,7 @@ #include "arch/instruction_set.h" #include "base/arena_allocator.h" #include "base/enums.h" +#include "base/macros.h" #include "base/malloc_arena_pool.h" #include "cfi_test.h" #include "gtest/gtest.h" @@ -30,7 +31,7 @@ #include "jni/jni_cfi_test_expected.inc" -namespace art { +namespace art HIDDEN { // Run the tests only on host. #ifndef ART_TARGET_ANDROID diff --git a/compiler/jni/jni_compiler_test.cc b/compiler/jni/jni_compiler_test.cc index e341f8d7cb..31ce7316a8 100644 --- a/compiler/jni/jni_compiler_test.cc +++ b/compiler/jni/jni_compiler_test.cc @@ -22,6 +22,7 @@ #include "art_method-inl.h" #include "base/bit_utils.h" #include "base/casts.h" +#include "base/macros.h" #include "base/mem_map.h" #include "class_linker.h" #include "common_compiler_test.h" @@ -71,7 +72,7 @@ extern "C" JNIEXPORT jint JNICALL Java_MyClassNatives_sbar_1Critical(jint count) // TODO: In the Baker read barrier configuration, add checks to ensure // the Marking Register's value is correct. -namespace art { +namespace art HIDDEN { enum class JniKind { kNormal, // Regular kind of un-annotated natives. @@ -849,6 +850,7 @@ jlong Java_MyClassNatives_fooJJ_synchronized(JNIEnv* env, jobject, jlong x, jlon return x | y; } +EXPORT // Defined in `libart.so`. void InitEntryPoints(JniEntryPoints* jpoints, QuickEntryPoints* qpoints, bool monitor_jni_entry_exit); diff --git a/compiler/jni/quick/arm/calling_convention_arm.cc b/compiler/jni/quick/arm/calling_convention_arm.cc index 3dfb741fde..d81ca77b74 100644 --- a/compiler/jni/quick/arm/calling_convention_arm.cc +++ b/compiler/jni/quick/arm/calling_convention_arm.cc @@ -23,7 +23,7 @@ #include "base/macros.h" #include "utils/arm/managed_register_arm.h" -namespace art { +namespace art HIDDEN { namespace arm { // diff --git a/compiler/jni/quick/arm/calling_convention_arm.h b/compiler/jni/quick/arm/calling_convention_arm.h index 353e3cfd1e..3a09d4eaad 100644 --- a/compiler/jni/quick/arm/calling_convention_arm.h +++ b/compiler/jni/quick/arm/calling_convention_arm.h @@ -18,9 +18,10 @@ #define ART_COMPILER_JNI_QUICK_ARM_CALLING_CONVENTION_ARM_H_ #include "base/enums.h" +#include "base/macros.h" #include "jni/quick/calling_convention.h" -namespace art { +namespace art HIDDEN { namespace arm { class ArmManagedRuntimeCallingConvention final : public ManagedRuntimeCallingConvention { diff --git a/compiler/jni/quick/arm64/calling_convention_arm64.cc b/compiler/jni/quick/arm64/calling_convention_arm64.cc index 3f9ed5073d..e716502911 100644 --- a/compiler/jni/quick/arm64/calling_convention_arm64.cc +++ b/compiler/jni/quick/arm64/calling_convention_arm64.cc @@ -22,7 +22,7 @@ #include "arch/instruction_set.h" #include "utils/arm64/managed_register_arm64.h" -namespace art { +namespace art HIDDEN { namespace arm64 { static constexpr ManagedRegister kXArgumentRegisters[] = { diff --git a/compiler/jni/quick/arm64/calling_convention_arm64.h b/compiler/jni/quick/arm64/calling_convention_arm64.h index b948bbe661..f29eb15fa8 100644 --- a/compiler/jni/quick/arm64/calling_convention_arm64.h +++ b/compiler/jni/quick/arm64/calling_convention_arm64.h @@ -18,9 +18,10 @@ #define ART_COMPILER_JNI_QUICK_ARM64_CALLING_CONVENTION_ARM64_H_ #include "base/enums.h" +#include "base/macros.h" #include "jni/quick/calling_convention.h" -namespace art { +namespace art HIDDEN { namespace arm64 { class Arm64ManagedRuntimeCallingConvention final : public ManagedRuntimeCallingConvention { diff --git a/compiler/jni/quick/calling_convention.cc b/compiler/jni/quick/calling_convention.cc index eb4d3724ee..ce9bee63e3 100644 --- a/compiler/jni/quick/calling_convention.cc +++ b/compiler/jni/quick/calling_convention.cc @@ -37,7 +37,7 @@ #include "jni/quick/x86_64/calling_convention_x86_64.h" #endif -namespace art { +namespace art HIDDEN { // Managed runtime calling convention diff --git a/compiler/jni/quick/calling_convention.h b/compiler/jni/quick/calling_convention.h index 8fe8e003f0..0187b14256 100644 --- a/compiler/jni/quick/calling_convention.h +++ b/compiler/jni/quick/calling_convention.h @@ -20,11 +20,12 @@ #include "base/arena_object.h" #include "base/array_ref.h" #include "base/enums.h" +#include "base/macros.h" #include "dex/primitive.h" #include "thread.h" #include "utils/managed_register.h" -namespace art { +namespace art HIDDEN { enum class InstructionSet; diff --git a/compiler/jni/quick/jni_compiler.cc b/compiler/jni/quick/jni_compiler.cc index a1ccabf5d2..c485a00c14 100644 --- a/compiler/jni/quick/jni_compiler.cc +++ b/compiler/jni/quick/jni_compiler.cc @@ -49,7 +49,7 @@ #define __ jni_asm-> -namespace art { +namespace art HIDDEN { constexpr size_t kIRTCookieSize = JniCallingConvention::SavedLocalReferenceCookieSize(); diff --git a/compiler/jni/quick/jni_compiler.h b/compiler/jni/quick/jni_compiler.h index 52a6f3cf02..d43b2a9917 100644 --- a/compiler/jni/quick/jni_compiler.h +++ b/compiler/jni/quick/jni_compiler.h @@ -21,8 +21,9 @@ #include "arch/instruction_set.h" #include "base/array_ref.h" +#include "base/macros.h" -namespace art { +namespace art HIDDEN { class ArenaAllocator; class ArtMethod; diff --git a/compiler/jni/quick/x86/calling_convention_x86.cc b/compiler/jni/quick/x86/calling_convention_x86.cc index b56d0a11c2..598e8e72ff 100644 --- a/compiler/jni/quick/x86/calling_convention_x86.cc +++ b/compiler/jni/quick/x86/calling_convention_x86.cc @@ -22,7 +22,7 @@ #include "arch/x86/jni_frame_x86.h" #include "utils/x86/managed_register_x86.h" -namespace art { +namespace art HIDDEN { namespace x86 { static constexpr ManagedRegister kManagedCoreArgumentRegisters[] = { diff --git a/compiler/jni/quick/x86/calling_convention_x86.h b/compiler/jni/quick/x86/calling_convention_x86.h index ebcd2664d8..f0d663dd98 100644 --- a/compiler/jni/quick/x86/calling_convention_x86.h +++ b/compiler/jni/quick/x86/calling_convention_x86.h @@ -18,9 +18,10 @@ #define ART_COMPILER_JNI_QUICK_X86_CALLING_CONVENTION_X86_H_ #include "base/enums.h" +#include "base/macros.h" #include "jni/quick/calling_convention.h" -namespace art { +namespace art HIDDEN { namespace x86 { class X86ManagedRuntimeCallingConvention final : public ManagedRuntimeCallingConvention { diff --git a/compiler/jni/quick/x86_64/calling_convention_x86_64.cc b/compiler/jni/quick/x86_64/calling_convention_x86_64.cc index 8a472b33e3..9d0761d2f7 100644 --- a/compiler/jni/quick/x86_64/calling_convention_x86_64.cc +++ b/compiler/jni/quick/x86_64/calling_convention_x86_64.cc @@ -23,7 +23,7 @@ #include "base/bit_utils.h" #include "utils/x86_64/managed_register_x86_64.h" -namespace art { +namespace art HIDDEN { namespace x86_64 { static constexpr ManagedRegister kCoreArgumentRegisters[] = { diff --git a/compiler/jni/quick/x86_64/calling_convention_x86_64.h b/compiler/jni/quick/x86_64/calling_convention_x86_64.h index 67d63b8558..859a277c60 100644 --- a/compiler/jni/quick/x86_64/calling_convention_x86_64.h +++ b/compiler/jni/quick/x86_64/calling_convention_x86_64.h @@ -18,9 +18,10 @@ #define ART_COMPILER_JNI_QUICK_X86_64_CALLING_CONVENTION_X86_64_H_ #include "base/enums.h" +#include "base/macros.h" #include "jni/quick/calling_convention.h" -namespace art { +namespace art HIDDEN { namespace x86_64 { class X86_64ManagedRuntimeCallingConvention final : public ManagedRuntimeCallingConvention { |