diff options
| -rw-r--r-- | adbconnection/adbconnection.cc | 2 | ||||
| -rw-r--r-- | build/apex/Android.bp | 14 | ||||
| -rwxr-xr-x | build/apex/runtests.sh | 3 | ||||
| -rw-r--r-- | runtime/base/locks.h | 2 | ||||
| -rw-r--r-- | tools/veridex/hidden_api.cc | 2 |
5 files changed, 17 insertions, 6 deletions
diff --git a/adbconnection/adbconnection.cc b/adbconnection/adbconnection.cc index b6d6600358..e1b5b627e7 100644 --- a/adbconnection/adbconnection.cc +++ b/adbconnection/adbconnection.cc @@ -28,7 +28,7 @@ #include "jni/java_vm_ext.h" #include "jni/jni_env_ext.h" #include "mirror/throwable.h" -#include "nativehelper/ScopedLocalRef.h" +#include "nativehelper/scoped_local_ref.h" #include "runtime-inl.h" #include "runtime_callbacks.h" #include "scoped_thread_state_change-inl.h" diff --git a/build/apex/Android.bp b/build/apex/Android.bp index 620abe38ce..b1c80cfdd6 100644 --- a/build/apex/Android.bp +++ b/build/apex/Android.bp @@ -29,10 +29,16 @@ bionic_binaries_both = [ ] // - Debug variants (binaries for which a 32-bit version is preferred). art_runtime_debug_binaries_prefer32 = [ - "dex2oatd", "dexoptanalyzerd", "profmand", ] +art_runtime_debug_binaries_prefer32_device = [ + "dex2oatd", +] +art_runtime_debug_binaries_both_host = [ + "dex2oatd", +] + // - Debug variants (libraries). art_runtime_debug_native_shared_libs = [ "libartd", @@ -165,7 +171,8 @@ apex { }, prefer32: { binaries: art_runtime_base_binaries_prefer32 - + art_runtime_debug_binaries_prefer32, + + art_runtime_debug_binaries_prefer32 + + art_runtime_debug_binaries_prefer32_device, }, first: { binaries: art_tools_device_binaries, @@ -196,7 +203,8 @@ art_apex { both: { // TODO: Add logic to create a `dalvikvm` symlink to `dalvikvm32` or `dalvikvm64` // (see `symlink_preferred_arch` in art/dalvikvm/Android.bp). - binaries: art_runtime_base_binaries_both, + binaries: art_runtime_base_binaries_both + + art_runtime_debug_binaries_both_host, }, first: { binaries: art_tools_host_binaries diff --git a/build/apex/runtests.sh b/build/apex/runtests.sh index 84c0f4f753..155709aee8 100755 --- a/build/apex/runtests.sh +++ b/build/apex/runtests.sh @@ -129,6 +129,9 @@ function check_binary { function check_multilib_binary { # TODO: Use $TARGET_ARCH (e.g. check whether it is "arm" or "arm64") to improve # the precision of this test? + if ! [[ -L "$mount_point/bin/${1}" ]]; then + fail_check "Cannot find symlink for multilib binary '$1' in mounted image" + fi [[ -x "$mount_point/bin/${1}32" ]] || [[ -x "$mount_point/bin/${1}64" ]] \ || fail_check "Cannot find binary '$1' in mounted image" } diff --git a/runtime/base/locks.h b/runtime/base/locks.h index 57719f1f6f..b7d8e31dbf 100644 --- a/runtime/base/locks.h +++ b/runtime/base/locks.h @@ -71,6 +71,7 @@ enum LockLevel : uint8_t { kRosAllocGlobalLock, kRosAllocBracketLock, kRosAllocBulkFreeLock, + kAllocSpaceLock, kTaggingLockLevel, kTransactionLogLock, kCustomTlsLock, @@ -84,7 +85,6 @@ enum LockLevel : uint8_t { kReferenceQueueClearedReferencesLock, kReferenceProcessorLock, kJitDebugInterfaceLock, - kAllocSpaceLock, kBumpPointerSpaceBlockLock, kArenaPoolLock, kInternTableLock, diff --git a/tools/veridex/hidden_api.cc b/tools/veridex/hidden_api.cc index 1dae93a55b..efb01f79c3 100644 --- a/tools/veridex/hidden_api.cc +++ b/tools/veridex/hidden_api.cc @@ -37,7 +37,7 @@ HiddenApi::HiddenApi(const char* filename, bool sdk_uses_only) { CHECK(success) << "Unknown ApiList flag: " << str; CHECK(membership.IsValid()) << "Invalid ApiList: " << membership; - if (sdk_uses_only != (membership == hiddenapi::ApiList::Whitelist())) { + if (sdk_uses_only != membership.Contains(hiddenapi::ApiList::Whitelist())) { // Either we want only SDK uses and this is not a whitelist entry, // or we want only non-SDK uses and this is a whitelist entry. continue; |