diff options
| author | Colin Cross <ccross@android.com> | 2014-02-04 16:22:03 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2014-02-18 17:22:15 -0800 |
| commit | dc781a13ddb4dabf646bb45d0c53b65cab948e5b (patch) | |
| tree | b74e4a579747ce12297b5a66f04669f42dfffa6a /build | |
| parent | 89925e948c49616689eb4959aaf0e4ff1de18161 (diff) | |
| download | art-dc781a13ddb4dabf646bb45d0c53b65cab948e5b.zip art-dc781a13ddb4dabf646bb45d0c53b65cab948e5b.tar.gz art-dc781a13ddb4dabf646bb45d0c53b65cab948e5b.tar.bz2 | |
art: convert makefiles to support multilib build
Convert makefiles to allow for building two architectures at the
same time. More changes may be necessary to get the tests to
build.
Change-Id: I02ba11706b7e5b5592d76e43c167bcbf0e665b93
Diffstat (limited to 'build')
| -rw-r--r-- | build/Android.common.mk | 10 | ||||
| -rw-r--r-- | build/Android.executable.mk | 5 | ||||
| -rw-r--r-- | build/Android.gtest.mk | 1 | ||||
| -rw-r--r-- | build/Android.libarttest.mk | 2 |
4 files changed, 14 insertions, 4 deletions
diff --git a/build/Android.common.mk b/build/Android.common.mk index 415d810..1299beb 100644 --- a/build/Android.common.mk +++ b/build/Android.common.mk @@ -17,6 +17,12 @@ ifndef ANDROID_COMMON_MK ANDROID_COMMON_MK = true +ART_SUPPORTED_ARCH := arm mips x86 x86_64 + +ifeq (,$(filter $(TARGET_ARCH),$(ART_SUPPORTED_ARCH))) +$(warning unsupported TARGET_ARCH=$(TARGET_ARCH)) +endif + # These can be overridden via the environment or by editing to # enable/disable certain build configuration. # @@ -162,10 +168,6 @@ $(error Required DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES is not set) endif ART_TARGET_CFLAGS += -DART_DEFAULT_INSTRUCTION_SET_FEATURES=$(DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) -ifeq ($(TARGET_ARCH),x86) -ART_TARGET_CFLAGS += -msse2 -endif - # Enable thread-safety for GCC 4.6 on the target but not for GCC 4.7 where this feature was removed. ifneq ($(filter 4.6 4.6.%, $(TARGET_GCC_VERSION)),) ART_TARGET_CFLAGS += -Wthread-safety diff --git a/build/Android.executable.mk b/build/Android.executable.mk index 5cf15be..e8d48e4 100644 --- a/build/Android.executable.mk +++ b/build/Android.executable.mk @@ -70,6 +70,7 @@ define build-art-executable ifeq ($$(art_target_or_host),target) LOCAL_CLANG := $(ART_TARGET_CLANG) LOCAL_CFLAGS += $(ART_TARGET_CFLAGS) + LOCAL_CFLAGS_x86 += $(ART_TARGET_CFLAGS_x86) ifeq ($$(art_ndebug_or_debug),debug) LOCAL_CFLAGS += $(ART_TARGET_DEBUG_CFLAGS) else @@ -95,6 +96,10 @@ define build-art-executable LOCAL_ADDITIONAL_DEPENDENCIES += art/build/Android.executable.mk ifeq ($$(art_target_or_host),target) + LOCAL_MODULE_TARGET_ARCH := $(ART_SUPPORTED_ARCH) + endif + + ifeq ($$(art_target_or_host),target) include $(BUILD_EXECUTABLE) ART_TARGET_EXECUTABLES := $(ART_TARGET_EXECUTABLES) $(TARGET_OUT_EXECUTABLES)/$$(LOCAL_MODULE) else # host diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index acaa0f8..332e505 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -133,6 +133,7 @@ define build-art-test ifeq ($$(art_target_or_host),target) LOCAL_CLANG := $(ART_TARGET_CLANG) LOCAL_CFLAGS += $(ART_TARGET_CFLAGS) $(ART_TARGET_DEBUG_CFLAGS) + LOCAL_CFLAGS_x86 := $(ART_TARGET_CFLAGS_x86) LOCAL_SHARED_LIBRARIES += libdl libicuuc libicui18n libnativehelper libz libcutils LOCAL_STATIC_LIBRARIES += libgtest LOCAL_MODULE_PATH := $(ART_NATIVETEST_OUT) diff --git a/build/Android.libarttest.mk b/build/Android.libarttest.mk index 65b78c9..d807a9c 100644 --- a/build/Android.libarttest.mk +++ b/build/Android.libarttest.mk @@ -48,9 +48,11 @@ define build-libarttest ifeq ($$(art_target_or_host),target) LOCAL_CLANG := $(ART_TARGET_CLANG) LOCAL_CFLAGS := $(ART_TARGET_CFLAGS) $(ART_TARGET_DEBUG_CFLAGS) + LOCAL_CFLAGS_x86 := $(ART_TARGET_CFLAGS_x86) LOCAL_SHARED_LIBRARIES += libdl libcutils LOCAL_STATIC_LIBRARIES := libgtest LOCAL_MODULE_PATH := $(ART_TEST_OUT) + LOCAL_MODULE_TARGET_ARCH := $(ART_SUPPORTED_ARCH) include $(BUILD_SHARED_LIBRARY) else # host LOCAL_CLANG := $(ART_HOST_CLANG) |