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/Android.common.mk | |
| 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/Android.common.mk')
| -rw-r--r-- | build/Android.common.mk | 10 |
1 files changed, 6 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 |