diff options
| author | Shri Borde <shri@google.com> | 2011-11-04 10:18:25 -0700 |
|---|---|---|
| committer | Shri Borde <shri@google.com> | 2011-11-04 10:18:25 -0700 |
| commit | f462cf2145a64818febe36cd7d4896373d98fc51 (patch) | |
| tree | 7c0291467b53df2ebd4def0bd704ac4698bb5d6e | |
| parent | 7cd8149e2cbad8b1ff6d481c37a4775d3c8cf2fa (diff) | |
| download | libyuv-f462cf2145a64818febe36cd7d4896373d98fc51.tar.gz | |
Diable libyuv build on x86. G+ does not compile libjingle (which uses libyuv) on x86 either
Change-Id: Iddd54af6cdbbc6f654442dc77b5c871710d404d2
| -rw-r--r-- | Android.mk | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -1,5 +1,7 @@ # This is the Android makefile for google3/third_party/libsrtp so that we can # build it with the Android NDK. +ifneq ($(TARGET_ARCH),x86) + LOCAL_PATH := $(call my-dir) common_SRC_FILES := \ @@ -26,12 +28,9 @@ include $(CLEAR_VARS) LOCAL_CPP_EXTENSION := .cc -ifneq ($(TARGET_ARCH),x86) - LOCAL_NDK_VERSION := 5 - LOCAL_SDK_VERSION := 9 - LOCAL_NDK_STL_VARIANT := stlport_static -endif - +LOCAL_NDK_VERSION := 5 +LOCAL_SDK_VERSION := 9 +LOCAL_NDK_STL_VARIANT := stlport_static LOCAL_SRC_FILES := $(common_SRC_FILES) LOCAL_CFLAGS += $(common_CFLAGS) @@ -41,3 +40,5 @@ LOCAL_MODULE:= libyuv_static LOCAL_MODULE_TAGS := optional include $(BUILD_STATIC_LIBRARY) + +endif |