diff options
| author | Colin Cross <ccross@android.com> | 2014-02-19 20:25:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-02-19 20:25:19 +0000 |
| commit | c4a2ee4958c1abe17973233b154874ade01d0a99 (patch) | |
| tree | f23021e6aa1bd70eed02e7b8573df689cb6b615b /build/Android.gtest.mk | |
| parent | de853fec54442da15a7de5df1e6988cbbe68954a (diff) | |
| parent | dc781a13ddb4dabf646bb45d0c53b65cab948e5b (diff) | |
| download | art-c4a2ee4958c1abe17973233b154874ade01d0a99.zip art-c4a2ee4958c1abe17973233b154874ade01d0a99.tar.gz art-c4a2ee4958c1abe17973233b154874ade01d0a99.tar.bz2 | |
Merge "art: convert makefiles to support multilib build"
Diffstat (limited to 'build/Android.gtest.mk')
| -rw-r--r-- | build/Android.gtest.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index 9c76c8d..791e954 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -135,6 +135,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) |