summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yohann Roussel <yroussel@google.com> 2017-01-06 09:53:42 +0000
committer android-build-merger <android-build-merger@google.com> 2017-01-06 09:53:42 +0000
commitdd6f64e3afdb76895fbea765d45e7fa575a530db (patch)
tree72faaf4ac4fd836de8604611fe43ea76a1a18aa0
parent3aea7330591e90a44e2bceb76decfe879bcdf8e5 (diff)
parent46848cada3a8fc8888329d567497422ecfb2aa46 (diff)
Merge "Fix LOCAL_SDK_VERSION of 3 multidex apks" am: 43c98c74fe am: ef5d1cb3b4 am: 1c0070aa5d
am: 46848cada3 Change-Id: I8703a23d833bd54cff281e4ba29b236dc9d76125
-rw-r--r--core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk2
-rw-r--r--core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk4
2 files changed, 3 insertions, 3 deletions
diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk
index 9b2b9f18a883..836ede61bba6 100644
--- a/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk
+++ b/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk
@@ -23,7 +23,7 @@ LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_SDK_VERSION := current
+LOCAL_SDK_VERSION := 8
LOCAL_PACKAGE_NAME := MultiDexLegacyAndException
diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk
index 874263f5b82d..2915914033f7 100644
--- a/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk
+++ b/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk
@@ -23,7 +23,7 @@ LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_SDK_VERSION := current
+LOCAL_SDK_VERSION := 8
LOCAL_PACKAGE_NAME := MultiDexLegacyTestApp
@@ -45,7 +45,7 @@ LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_SDK_VERSION := current
+LOCAL_SDK_VERSION := 8
LOCAL_PACKAGE_NAME := MultiDexLegacyTestApp2