summaryrefslogtreecommitdiff
path: root/webrtc.target.linux-x86.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-10-23 15:55:32 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-10-23 15:55:32 +0000
commit33608a62faf65da09ab6c18a9d68904c1bcdf52a (patch)
tree8e0188b1d5dec1bfd9ed982023931b9db6c2732a /webrtc.target.linux-x86.mk
parentf7f4abaf2b6bdb815bf1f76ae4b66e2b5aa1b625 (diff)
downloadwebrtc-33608a62faf65da09ab6c18a9d68904c1bcdf52a.tar.gz
Update makefiles after merge of Chromium at 9ef958e74e13
This commit was generated by merge_from_chromium.py. Change-Id: I9f8bef9f285b9b8b005c64271d0c3b0911623223
Diffstat (limited to 'webrtc.target.linux-x86.mk')
-rw-r--r--webrtc.target.linux-x86.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/webrtc.target.linux-x86.mk b/webrtc.target.linux-x86.mk
index fd54fed9..ed385335 100644
--- a/webrtc.target.linux-x86.mk
+++ b/webrtc.target.linux-x86.mk
@@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_MODULE := third_party_webrtc_webrtc_gyp
LOCAL_MODULE_SUFFIX := .a
LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
-LOCAL_SDK_VERSION := 19
+LOCAL_SDK_VERSION := 21
gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))