diff options
| author | 2018-01-04 15:30:45 -0800 | |
|---|---|---|
| committer | 2018-01-04 16:36:15 -0800 | |
| commit | ecb8662b817a2f5d6f9c035ca4d0bdc12f865b2c (patch) | |
| tree | 7e28af8d410cd96b0768c016eb289a5deb9b387f | |
| parent | a821bb1a71637dbd2e251795fce26f5f6f937299 (diff) | |
Enable compact dex by default
Disabled two testrunner columns to preserve testing of normal dex
files.
Bug: 63756964
Test: test-art-host
Change-Id: Icec758b614f938c1dede079ce86df00a9a4f833e
| -rw-r--r-- | build/art.go | 2 | ||||
| -rw-r--r-- | test/testrunner/target_config.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/build/art.go b/build/art.go index bf6eee6c41..59480a0d0f 100644 --- a/build/art.go +++ b/build/art.go @@ -66,7 +66,7 @@ func globalFlags(ctx android.BaseContext) ([]string, []string) { "-DART_READ_BARRIER_TYPE_IS_"+barrierType+"=1") } - cdexLevel := envDefault(ctx, "ART_DEFAULT_COMPACT_DEX_LEVEL", "none") + cdexLevel := envDefault(ctx, "ART_DEFAULT_COMPACT_DEX_LEVEL", "fast") cflags = append(cflags, "-DART_DEFAULT_COMPACT_DEX_LEVEL="+cdexLevel) // We need larger stack overflow guards for ASAN, as the compiled code will have diff --git a/test/testrunner/target_config.py b/test/testrunner/target_config.py index 297ce08bee..2bb407db58 100644 --- a/test/testrunner/target_config.py +++ b/test/testrunner/target_config.py @@ -234,8 +234,8 @@ target_config = { 'env' : { 'ART_USE_READ_BARRIER' : 'false', 'ART_HEAP_POISONING' : 'true', - # Get some extra automated testing coverage for compact dex. - 'ART_DEFAULT_COMPACT_DEX_LEVEL' : 'fast' + # Disable compact dex to get coverage of standard dex file usage. + 'ART_DEFAULT_COMPACT_DEX_LEVEL' : 'none' } }, 'art-preopt' : { @@ -280,8 +280,8 @@ target_config = { 'env': { 'ART_DEFAULT_GC_TYPE' : 'SS', 'ART_USE_READ_BARRIER' : 'false', - # Get some extra automated testing coverage for compact dex. - 'ART_DEFAULT_COMPACT_DEX_LEVEL' : 'fast' + # Disable compact dex to get coverage of standard dex file usage. + 'ART_DEFAULT_COMPACT_DEX_LEVEL' : 'none' } }, 'art-gtest-gss-gc': { |