Move base64 to test code
Change-Id: I0cda5d8a559a2d60250c1d8a8ee6f69509515214
diff --git a/build/Android.aexec.host.mk b/build/Android.aexec.host.mk
index 6efc9e9..25a66a8 100644
--- a/build/Android.aexec.host.mk
+++ b/build/Android.aexec.host.mk
@@ -15,16 +15,10 @@
#
include $(CLEAR_VARS)
-
+LOCAL_CPP_EXTENSION := $(ART_CPP_EXTENSION)
LOCAL_MODULE := aexec
LOCAL_MODULE_TAGS := optional
-
-include $(build_path)/Android.common.mk
LOCAL_SRC_FILES := $(AEXEC_SRC_FILES)
-
-LOCAL_C_INCLUDES :=
-
-LOCAL_SHARED_LIBRARIES := \
- libart
-
+LOCAL_CFLAGS := $(ART_CFLAGS)
+LOCAL_SHARED_LIBRARIES := libart
include $(BUILD_HOST_EXECUTABLE)
diff --git a/build/Android.aexec.mk b/build/Android.aexec.mk
index 411128e..216cc2c 100644
--- a/build/Android.aexec.mk
+++ b/build/Android.aexec.mk
@@ -15,18 +15,11 @@
#
include $(CLEAR_VARS)
-
+include external/stlport/libstlport.mk
+LOCAL_CPP_EXTENSION := $(ART_CPP_EXTENSION)
LOCAL_MODULE := aexec
LOCAL_MODULE_TAGS := optional
-
-include $(build_path)/Android.common.mk
LOCAL_SRC_FILES := $(AEXEC_SRC_FILES)
-
-include external/stlport/libstlport.mk
-LOCAL_C_INCLUDES +=
-
-LOCAL_SHARED_LIBRARIES := \
- libart \
- libstlport
-
+LOCAL_CFLAGS := $(ART_CFLAGS)
+LOCAL_SHARED_LIBRARIES := libart libstlport
include $(BUILD_EXECUTABLE)
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 \
diff --git a/build/Android.libart.host.mk b/build/Android.libart.host.mk
index 1612bf8..4d6f980 100644
--- a/build/Android.libart.host.mk
+++ b/build/Android.libart.host.mk
@@ -15,21 +15,11 @@
#
include $(CLEAR_VARS)
-
+LOCAL_CPP_EXTENSION := $(ART_CPP_EXTENSION)
LOCAL_MODULE := libart
LOCAL_MODULE_TAGS := optional
-
-include $(build_path)/Android.common.mk
LOCAL_SRC_FILES := $(LIBART_HOST_SRC_FILES)
-
-LOCAL_WHOLE_STATIC_LIBRARIES := \
- libcutils \
- liblog \
- libz
-
-LOCAL_LDLIBS := \
- -ldl \
- -lpthread \
- -lrt
-
+LOCAL_CFLAGS := $(ART_CFLAGS)
+LOCAL_WHOLE_STATIC_LIBRARIES := libcutils liblog libz
+LOCAL_LDLIBS := -ldl -lpthread -lrt
include $(BUILD_HOST_SHARED_LIBRARY)
diff --git a/build/Android.libart.mk b/build/Android.libart.mk
index e9dcfb6..29a38f5 100644
--- a/build/Android.libart.mk
+++ b/build/Android.libart.mk
@@ -15,21 +15,12 @@
#
include $(CLEAR_VARS)
-
+include external/stlport/libstlport.mk
+LOCAL_CPP_EXTENSION := $(ART_CPP_EXTENSION)
LOCAL_MODULE := libart
LOCAL_MODULE_TAGS := optional
-
-include $(build_path)/Android.common.mk
LOCAL_SRC_FILES := $(LIBART_TARGET_SRC_FILES)
-
-include external/stlport/libstlport.mk
-
-LOCAL_STATIC_LIBRARIES := \
- libcutils \
- liblog \
- libz
-
-LOCAL_SHARED_LIBRARIES := \
- libstlport
-
+LOCAL_CFLAGS := $(ART_CFLAGS)
+LOCAL_STATIC_LIBRARIES := libcutils liblog libz
+LOCAL_SHARED_LIBRARIES := libstlport
include $(BUILD_SHARED_LIBRARY)
diff --git a/build/Android.test.host.mk b/build/Android.test.host.mk
index 23346d9..67ce272 100644
--- a/build/Android.test.host.mk
+++ b/build/Android.test.host.mk
@@ -15,32 +15,23 @@
#
include $(CLEAR_VARS)
-
-local_module_tags := tests
-
-include $(build_path)/Android.common.mk
-local_cpp_extension := $(LOCAL_CPP_EXTENSION)
-local_cflags := $(LOCAL_CFLAGS)
-
-local_shared_libraries := \
- libart
-
-local_c_includes := \
- external/gtest/include
-
-local_whole_static_libraries := \
- libgtest_host \
- libgtest_main_host
+LOCAL_CPP_EXTENSION := $(ART_CPP_EXTENSION)
+LOCAL_MODULE := libarttest
+LOCAL_MODULE_TAGS := tests
+LOCAL_SRC_FILES := $(LIBARTTEST_COMMON_SRC_FILES)
+LOCAL_CFLAGS := $(ART_CFLAGS)
+LOCAL_LDLIBS := -lrt
+include $(BUILD_HOST_SHARED_LIBRARY)
$(foreach file,$(TEST_HOST_SRC_FILES), \
$(eval include $(CLEAR_VARS)) \
- $(eval LOCAL_CPP_EXTENSION := $(local_cpp_extension)) \
+ $(eval LOCAL_CPP_EXTENSION := $(ART_CPP_EXTENSION)) \
$(eval LOCAL_MODULE := $(notdir $(file:%.cc=%))) \
- $(eval LOCAL_MODULE_TAGS := $(local_module_tags)) \
+ $(eval LOCAL_MODULE_TAGS := tests) \
$(eval LOCAL_SRC_FILES := $(file)) \
- $(eval LOCAL_CFLAGS := $(local_cflags)) \
- $(eval LOCAL_C_INCLUDES := $(local_c_includes)) \
- $(eval LOCAL_WHOLE_STATIC_LIBRARIES := $(local_whole_static_libraries)) \
- $(eval LOCAL_SHARED_LIBRARIES := $(local_shared_libraries)) \
+ $(eval LOCAL_CFLAGS := $(ART_CFLAGS)) \
+ $(eval LOCAL_C_INCLUDES += external/gtest/include) \
+ $(eval LOCAL_WHOLE_STATIC_LIBRARIES := libgtest_host libgtest_main_host) \
+ $(eval LOCAL_SHARED_LIBRARIES := libarttest libart) \
$(eval include $(BUILD_HOST_EXECUTABLE)) \
)
diff --git a/build/Android.test.mk b/build/Android.test.mk
index 7d7b2ce..1c2a718 100644
--- a/build/Android.test.mk
+++ b/build/Android.test.mk
@@ -15,34 +15,25 @@
#
include $(CLEAR_VARS)
-
-local_module_tags := tests
-
-include $(build_path)/Android.common.mk
-local_cpp_extension := $(LOCAL_CPP_EXTENSION)
-local_cflags := $(LOCAL_CFLAGS)
-
-local_shared_libraries := \
- libart \
- libstlport
-
-local_c_includes := \
- external/gtest/include
-
-local_static_libraries := \
- libgtest \
- libgtest_main
+include external/stlport/libstlport.mk
+LOCAL_CPP_EXTENSION := $(ART_CPP_EXTENSION)
+LOCAL_MODULE := libarttest
+LOCAL_MODULE_TAGS := optional
+LOCAL_SRC_FILES := $(LIBARTTEST_COMMON_SRC_FILES)
+LOCAL_CFLAGS := $(ART_CFLAGS)
+LOCAL_SHARED_LIBRARIES := libstlport
+include $(BUILD_SHARED_LIBRARY)
$(foreach file,$(TEST_TARGET_SRC_FILES), \
$(eval include $(CLEAR_VARS)) \
- $(eval LOCAL_CPP_EXTENSION := $(local_cpp_extension)) \
- $(eval LOCAL_MODULE := $(notdir $(file:%.cc=%))) \
- $(eval LOCAL_MODULE_TAGS := $(local_module_tags)) \
- $(eval LOCAL_SRC_FILES := $(file)) \
- $(eval LOCAL_CFLAGS := $(local_cflags)) \
$(eval include external/stlport/libstlport.mk) \
- $(eval LOCAL_C_INCLUDES += $(local_c_includes)) \
- $(eval LOCAL_STATIC_LIBRARIES := $(local_static_libraries)) \
- $(eval LOCAL_SHARED_LIBRARIES := $(local_shared_libraries)) \
+ $(eval LOCAL_CPP_EXTENSION := $(ART_CPP_EXTENSION)) \
+ $(eval LOCAL_MODULE := $(notdir $(file:%.cc=%))) \
+ $(eval LOCAL_MODULE_TAGS := tests) \
+ $(eval LOCAL_SRC_FILES := $(file)) \
+ $(eval LOCAL_CFLAGS := $(ART_CFLAGS)) \
+ $(eval LOCAL_C_INCLUDES += external/gtest/include) \
+ $(eval LOCAL_STATIC_LIBRARIES := libgtest libgtest_main) \
+ $(eval LOCAL_SHARED_LIBRARIES := libarttest libart libstlport) \
$(eval include $(BUILD_EXECUTABLE)) \
)