summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorjeffhao <jeffhao@google.com>2011-09-29 15:13:22 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-09-29 15:13:22 -0700
commit5b36eb39708e6daef5f2e4abea4ab3cc31419804 (patch)
tree49f78fefdf33ca0ac764cc21ac30aba4b5ba9252 /build
parent12246b82eb9cdc621662a30b3c854d1abd307ec8 (diff)
parentabcfde3b9661618a88e170fac6fdf092a59eb993 (diff)
downloadart-5b36eb39708e6daef5f2e4abea4ab3cc31419804.tar.gz
art-5b36eb39708e6daef5f2e4abea4ab3cc31419804.tar.bz2
art-5b36eb39708e6daef5f2e4abea4ab3cc31419804.zip
Merge "Fixed test for static final fields that don't use <clinit>." into dalvik-dev
Diffstat (limited to 'build')
-rw-r--r--build/Android.common.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/build/Android.common.mk b/build/Android.common.mk
index c200a0cf61..1188d129c8 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -222,6 +222,7 @@ TEST_DEX_DIRECTORIES := \
StackWalk2 \
StaticLeafMethods \
Statics \
+ StaticsFromCode \
SystemMethods \
Invoke \
XandY