am 3c683c5d: Revert "HACK: Disable native stack trace dumping for tetra. DO NOT MERGE"

* commit '3c683c5d107cb43e8027d740ed579ef92a88af2e':
  Revert "HACK: Disable native stack trace dumping for tetra. DO NOT MERGE"

diff --cc runtime/Android.mk
index ebbe2a3,84f2248..86201ba
--- 1/runtime/Android.mk
--- 2/runtime/Android.mk
+++ b/runtime/Android.mk
@@@ -339,33 -327,10 +339,29 @@@ els
    LIBART_CFLAGS += -DUSE_JEMALLOC
  endif
  
 -ifeq ($(ART_USE_HSPACE_COMPACT),true)
 -  LIBART_CFLAGS += -DART_USE_HSPACE_COMPACT
 +# Default dex2oat instruction set features.
 +LIBART_HOST_DEFAULT_INSTRUCTION_SET_FEATURES := default
 +LIBART_TARGET_DEFAULT_INSTRUCTION_SET_FEATURES := default
 +2ND_LIBART_TARGET_DEFAULT_INSTRUCTION_SET_FEATURES := default
 +ifeq ($(DEX2OAT_TARGET_ARCH),arm)
 +  ifneq (,$(filter $(DEX2OAT_TARGET_CPU_VARIANT),cortex-a15 krait denver))
 +    LIBART_TARGET_DEFAULT_INSTRUCTION_SET_FEATURES := atomic_ldrd_strd,div
 +  else
 +    ifneq (,$(filter $(DEX2OAT_TARGET_CPU_VARIANT),cortex-a7))
 +      LIBART_TARGET_DEFAULT_INSTRUCTION_SET_FEATURES := div
 +    endif
 +  endif
 +endif
 +ifeq ($(2ND_DEX2OAT_TARGET_ARCH),arm)
 +  ifneq (,$(filter $(DEX2OAT_TARGET_CPU_VARIANT),cortex-a15 krait denver))
 +    2ND_LIBART_TARGET_DEFAULT_INSTRUCTION_SET_FEATURES := atomic_ldrd_strd,div
 +  else
 +    ifneq (,$(filter $(DEX2OAT_TARGET_CPU_VARIANT),cortex-a7))
 +      2ND_LIBART_TARGET_DEFAULT_INSTRUCTION_SET_FEATURES := div
 +    endif
 +  endif
  endif
  
- ifneq ($(filter tetra, $(TARGET_DEVICE)),)
-   LIBART_CFLAGS += -DNO_DUMP_NATIVE_STACKS
- endif
- 
  # $(1): target or host
  # $(2): ndebug or debug
  define build-libart

diff --cc runtime/thread.cc
Simple merge