diff options
| author | Alan Viverette <alanv@google.com> | 2017-05-12 09:17:44 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-12 09:17:44 +0000 |
| commit | 6e28e64b19f49eb1c095799667a62aeef9180cc9 (patch) | |
| tree | eb5dbb20ae4833b82dc76d1c3593dac419594707 | |
| parent | b7a527aa0e7368c3d25b84250731d66d5cd4be4e (diff) | |
| parent | c9ca340336b1d4c0711acb9f86785287f0f4f961 (diff) | |
| download | sdk-6e28e64b19f49eb1c095799667a62aeef9180cc9.tar.gz | |
Merge "Use correct LOCAL_SDK_VERSION" into oc-dev am: bd2d93448b
am: c9ca340336
Change-Id: I27a21b61d60bf75859ab88f0a0ac4021c9c35375
| -rw-r--r-- | current/support-v13/Android.mk | 2 | ||||
| -rw-r--r-- | current/support-v4/Android.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/current/support-v13/Android.mk b/current/support-v13/Android.mk index 169f66a70..e1048f6e5 100644 --- a/current/support-v13/Android.mk +++ b/current/support-v13/Android.mk @@ -17,7 +17,7 @@ LOCAL_PATH := $(call my-dir) # Statically include transitive dependencies. include $(CLEAR_VARS) LOCAL_MODULE := android-support-v13 -LOCAL_SDK_VERSION := $(SUPPORT_CURRENT_SDK_VERSION) +LOCAL_SDK_VERSION := current LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-v4 \ android-support-v13-nodeps diff --git a/current/support-v4/Android.mk b/current/support-v4/Android.mk index a98317cdc..3ce936b38 100644 --- a/current/support-v4/Android.mk +++ b/current/support-v4/Android.mk @@ -17,7 +17,7 @@ LOCAL_PATH := $(call my-dir) # Statically include transitive dependencies. include $(CLEAR_VARS) LOCAL_MODULE := android-support-v4 -LOCAL_SDK_VERSION := $(SUPPORT_CURRENT_SDK_VERSION) +LOCAL_SDK_VERSION := current LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-compat \ android-support-media-compat \ |