Move base64 to test code
Change-Id: I0cda5d8a559a2d60250c1d8a8ee6f69509515214
diff --git a/build/Android.common.mk b/build/Android.common.mk
index a351dc7..46fa2a2 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -14,9 +14,9 @@
# limitations under the License.
#
-LOCAL_CPP_EXTENSION := .cc
+ART_CPP_EXTENSION := .cc
-LOCAL_CFLAGS := \
+ART_CFLAGS := \
-O0 \
-ggdb3 \
-Wall \
@@ -27,20 +27,11 @@
-fno-align-jumps \
-fstrict-aliasing
-ifeq ($(TARGET_ARCH),arm)
-LOCAL_CFLAGS +=
-endif
-
-ifeq ($(TARGET_ARCH),x86)
-LOCAL_CFLAGS +=
-endif
-
AEXEC_SRC_FILES := \
src/main.cc
LIBART_COMMON_SRC_FILES := \
src/assembler.cc \
- src/base64.cc \
src/class_linker.cc \
src/dex_file.cc \
src/dex_instruction.cc \
@@ -65,6 +56,9 @@
src/logging_linux.cc \
src/runtime_linux.cc
+LIBARTTEST_COMMON_SRC_FILES := \
+ src/base64.cc
+
TEST_COMMON_SRC_FILES := \
src/class_linker_test.cc \
src/dex_file_test.cc \