| commit | 032fd6b50e86b33c69240573efb588eb86933ef3 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Thu Oct 22 15:49:45 2015 -0700 |
| committer | Daniel Xie <dxie@google.com> | Thu Oct 22 15:49:45 2015 -0700 |
| tree | fdc3ece4f64ff48ddd6f5e49a25e2a5abdf2afde | |
| parent | 791e51a5059826e3fb81dfa5b575bcae00a3d29c [diff] |
DO NOT MERGE CTS version is now 6.0_r1.5 Change-Id: Ifc77b722ba16368648e952606103d60de1adb611
diff --git a/apps/CtsVerifier/Android.mk b/apps/CtsVerifier/Android.mk index 34246cc..924524b 100644 --- a/apps/CtsVerifier/Android.mk +++ b/apps/CtsVerifier/Android.mk
@@ -41,7 +41,7 @@ LOCAL_PACKAGE_NAME := CtsVerifier -LOCAL_AAPT_FLAGS += --version-name "6.0_r1 $(BUILD_NUMBER)" +LOCAL_AAPT_FLAGS += --version-name "6.0_r1.5 $(BUILD_NUMBER)" LOCAL_JNI_SHARED_LIBRARIES := libctsverifier_jni libaudioloopback_jni
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java b/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java index 782e6ab..854fce6 100644 --- a/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java +++ b/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java
@@ -31,7 +31,7 @@ @Option(name="cts-install-path", description="the path to the cts installation to use") private String mCtsRootDirPath = System.getProperty("CTS_ROOT"); - public static final String CTS_BUILD_VERSION = "6.0_r1"; + public static final String CTS_BUILD_VERSION = "6.0_r1.5"; public static final String CTS_PACKAGE = "com.android.cts.tradefed.testtype"; /**