diff options
author | Android Chromium Automerger <chromium-automerger@android> | 2014-10-23 15:55:31 +0000 |
---|---|---|
committer | Android Chromium Automerger <chromium-automerger@android> | 2014-10-23 15:55:31 +0000 |
commit | 92caeade0b8c8e86d72fd4390ad998643e63d756 (patch) | |
tree | f6059c4d5fec5ae16e8bed609c759f3d0b1c864e /ots.target.linux-arm.mk | |
parent | d487c1ed9b3c8c409bd4a237fe1ebe17cb0d1674 (diff) | |
download | ots-92caeade0b8c8e86d72fd4390ad998643e63d756.tar.gz |
Update makefiles after merge of Chromium at 9ef958e74e13
This commit was generated by merge_from_chromium.py.
Change-Id: I8d97bddd35e54b452d282c77cccccf47e50b4b6d
Diffstat (limited to 'ots.target.linux-arm.mk')
-rw-r--r-- | ots.target.linux-arm.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ots.target.linux-arm.mk b/ots.target.linux-arm.mk index 1b77d03..5135f9e 100644 --- a/ots.target.linux-arm.mk +++ b/ots.target.linux-arm.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_ots_ots_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)) |