| commit | 6a21982c960c8fb92ece0483c5b5b6047b0a7f77 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Oct 17 15:08:21 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Oct 17 15:08:21 2011 -0700 |
| tree | 132f6a62002bb80dd84fd96cd41eb1f36647e300 | |
| parent | 2641f715c987ba560d246adf95e5e5434d70c6db [diff] | |
| parent | 498508c1187dc07d3eae5476784cde20f5224d93 [diff] |
Merge "Clean up the makefile and add a missing 'static'." into dalvik-dev
diff --git a/build/Android.common.mk b/build/Android.common.mk index f46dd21..7a3dffb 100644 --- a/build/Android.common.mk +++ b/build/Android.common.mk
@@ -194,8 +194,8 @@ LIBARTTEST_COMMON_SRC_FILES := \ src/base64.cc \ src/jni_tests.cc \ - src/stack_walk.cc \ - src/stack_walk_refmap.cc + test/StackWalk/stack_walk.cc \ + test/ReferenceMap/stack_walk_refmap.cc TEST_COMMON_SRC_FILES := \ src/class_linker_test.cc \
diff --git a/src/stack_walk_refmap.cc b/test/ReferenceMap/stack_walk_refmap_jni.cc similarity index 100% rename from src/stack_walk_refmap.cc rename to test/ReferenceMap/stack_walk_refmap_jni.cc
diff --git a/src/stack_walk.cc b/test/StackWalk/stack_walk_jni.cc similarity index 100% rename from src/stack_walk.cc rename to test/StackWalk/stack_walk_jni.cc