diff options
Diffstat (limited to 'android-webrtc.mk')
| -rw-r--r-- | android-webrtc.mk | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/android-webrtc.mk b/android-webrtc.mk index cd495b0547..2b8b5b9ba2 100644 --- a/android-webrtc.mk +++ b/android-webrtc.mk @@ -9,7 +9,6 @@ # These defines will apply to all source files # Think again before changing it MY_WEBRTC_COMMON_DEFS := \ - '-DWEBRTC_TARGET_PC' \ '-DWEBRTC_LINUX' \ '-DWEBRTC_THREAD_RR' \ '-DWEBRTC_CLOCK_TYPE_REALTIME' \ @@ -19,28 +18,28 @@ 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 += \ - '-DWEBRTC_ARCH_ARM_NEON' -MY_ARM_CFLAGS_NEON := \ - -flax-vector-conversions -endif -ifneq (,$(filter '-DWEBRTC_DETECT_ARM_NEON' '-DWEBRTC_ARCH_ARM_NEON', \ - $(MY_WEBRTC_COMMON_DEFS))) -WEBRTC_BUILD_NEON_LIBS := true -endif - -ifeq ($(ARCH_ARM_HAVE_ARMV7A),true) -MY_WEBRTC_COMMON_DEFS += \ - '-DWEBRTC_ARCH_ARM_V7A' -endif - -endif # ifeq ($(TARGET_ARCH),arm)
\ No newline at end of file +# The following upstram ARM_NEON and ARMV7A defintions do not work on AOSP yet. +# They should be fixed in the next merge from upstream. +## 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_arm += \ +# '-DWEBRTC_ARCH_ARM_NEON' +#MY_ARM_CFLAGS_NEON := \ +# -flax-vector-conversions +#endif +# +#ifneq (,$(filter '-DWEBRTC_DETECT_ARM_NEON' '-DWEBRTC_ARCH_ARM_NEON', \ +# $(MY_WEBRTC_COMMON_DEFS_arm))) +#WEBRTC_BUILD_NEON_LIBS := true +#endif +# +#ifeq ($(ARCH_ARM_HAVE_ARMV7A),true) +#MY_WEBRTC_COMMON_DEFS_arm += \ +# '-DWEBRTC_ARCH_ARM_V7A' +#endif |