diff options
| author | Ying Wang <wangying@google.com> | 2014-03-10 15:26:43 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-03-10 15:26:43 -0700 |
| commit | 792d5464151b0e5744e311ff79eca886e277807b (patch) | |
| tree | 5ab5badddaf7c47c787faea14c6aab3561e405b3 /android-webrtc.mk | |
| parent | a688b4b849213134f495a9abff1a39305e5a9c54 (diff) | |
| download | webrtc-792d5464151b0e5744e311ff79eca886e277807b.tar.gz | |
Use arch specific flags to fix multilib build.
Bug: 13391438
Change-Id: Ie9844df210c7ea24da952811ba854850fc17ded9
Diffstat (limited to 'android-webrtc.mk')
| -rw-r--r-- | android-webrtc.mk | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/android-webrtc.mk b/android-webrtc.mk index dc92aeb8e2..6e3b7e4e45 100644 --- a/android-webrtc.mk +++ b/android-webrtc.mk @@ -19,15 +19,14 @@ MY_WEBRTC_COMMON_DEFS := \ # '-DWEBRTC_ANDROID_OPENSLES' [module audio_device] # '-DNETEQ_VOICEENGINE_CODECS' [module audio_coding neteq] # '-DWEBRTC_MODULE_UTILITY_VIDEO' [module media_file] [module utility] -ifeq ($(TARGET_ARCH),arm) -MY_WEBRTC_COMMON_DEFS += \ +MY_WEBRTC_COMMON_DEFS_arm := \ '-DWEBRTC_ARCH_ARM' # '-DWEBRTC_DETECT_ARM_NEON' # only used in a build configuration without Neon # TODO(kma): figure out if the above define could be moved to NDK build only. # TODO(kma): test if the code under next two macros works with generic GCC compilers ifeq ($(ARCH_ARM_HAVE_NEON),true) -MY_WEBRTC_COMMON_DEFS += \ +MY_WEBRTC_COMMON_DEFS_arm += \ '-DWEBRTC_ARCH_ARM_NEON' MY_ARM_CFLAGS_NEON := \ -flax-vector-conversions @@ -39,11 +38,9 @@ WEBRTC_BUILD_NEON_LIBS := true endif ifeq ($(ARCH_ARM_HAVE_ARMV7A),true) -MY_WEBRTC_COMMON_DEFS += \ +MY_WEBRTC_COMMON_DEFS_arm += \ '-DWEBRTC_ARCH_ARM_V7A' endif -else ifeq ($(TARGET_ARCH),x86) -MY_WEBRTC_COMMON_DEFS += \ +MY_WEBRTC_COMMON_DEFS_x86 := \ '-DWEBRTC_USE_SSE2' -endif |