Update Art 13 to release version (branch android-13.0.0_r3)
See https://source.android.com/docs/setup/start/build-numbers#source-code-tags-and-builds
Change-Id: I0c72d2e6423f4ca7769b6259f624eee93a993b91
diff --git a/.gitignore b/.gitignore
index ae1be52..405e837 100644
--- a/.gitignore
+++ b/.gitignore
@@ -274,8 +274,8 @@
tools/*/art-10.0.0.tar.gz
tools/*/host/art-12.0.0-beta4
tools/*/host/art-12.0.0-beta4.tar.gz
-tools/*/host/art-13-dev
-tools/*/host/art-13-dev.tar.gz
+tools/*/host/art-13.0.0
+tools/*/host/art-13.0.0.tar.gz
tools/*/host/art-master
tools/*/host/art-master.tar.gz
tools/*/art.tar.gz
diff --git a/build.gradle b/build.gradle
index 8f84e7f..90d75ef 100644
--- a/build.gradle
+++ b/build.gradle
@@ -411,7 +411,7 @@
"linux/art-9.0.0",
"linux/art-10.0.0",
"linux/host/art-12.0.0-beta4",
- "linux/host/art-13-dev",
+ "linux/host/art-13.0.0",
"linux/host/art-master",
"linux/dalvik",
"linux/dalvik-4.0.4",
diff --git a/src/test/java/com/android/tools/r8/ToolHelper.java b/src/test/java/com/android/tools/r8/ToolHelper.java
index d948ad2..f31c1ae 100644
--- a/src/test/java/com/android/tools/r8/ToolHelper.java
+++ b/src/test/java/com/android/tools/r8/ToolHelper.java
@@ -619,7 +619,7 @@
ImmutableMap.<DexVm, String>builder()
.put(DexVm.ART_DEFAULT, "art")
.put(DexVm.ART_MASTER_HOST, "host/art-master")
- .put(DexVm.ART_13_0_0_HOST, "host/art-13-dev")
+ .put(DexVm.ART_13_0_0_HOST, "host/art-13.0.0")
.put(DexVm.ART_12_0_0_HOST, "host/art-12.0.0-beta4")
.put(DexVm.ART_10_0_0_HOST, "art-10.0.0")
.put(DexVm.ART_9_0_0_HOST, "art-9.0.0")
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/ThrowingInstructionBeforeOtherwiseRedundantInstanceStoreTest.java b/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/ThrowingInstructionBeforeOtherwiseRedundantInstanceStoreTest.java
index 29ab7c9..4c3f07d 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/ThrowingInstructionBeforeOtherwiseRedundantInstanceStoreTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/ThrowingInstructionBeforeOtherwiseRedundantInstanceStoreTest.java
@@ -7,7 +7,6 @@
import com.android.tools.r8.CompilationMode;
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.ToolHelper.DexVm.Version;
import java.util.List;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -37,11 +36,7 @@
.setMinApi(parameters.getApiLevel())
.compile()
.run(parameters.getRuntime(), Main.class)
- .applyIf(
- // See b/229706824.
- parameters.getDexRuntimeVersion().equals(Version.V13_0_0),
- r -> r.assertSuccessWithOutputLines("0"),
- r -> r.assertSuccessWithOutputLines("1"));
+ .assertSuccessWithOutputLines("1");
}
static class Main {
diff --git a/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/ThrowingInstructionBeforeOtherwiseRedundantStaticStoreTest.java b/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/ThrowingInstructionBeforeOtherwiseRedundantStaticStoreTest.java
index abf3664..60a0b34 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/ThrowingInstructionBeforeOtherwiseRedundantStaticStoreTest.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/redundantfieldloadelimination/ThrowingInstructionBeforeOtherwiseRedundantStaticStoreTest.java
@@ -7,7 +7,6 @@
import com.android.tools.r8.CompilationMode;
import com.android.tools.r8.TestBase;
import com.android.tools.r8.TestParameters;
-import com.android.tools.r8.ToolHelper.DexVm.Version;
import java.util.List;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -37,11 +36,7 @@
.setMinApi(parameters.getApiLevel())
.compile()
.run(parameters.getRuntime(), Main.class)
- .applyIf(
- // See b/229706824.
- parameters.getDexRuntimeVersion().equals(Version.V13_0_0),
- r -> r.assertSuccessWithOutputLines("0"),
- r -> r.assertSuccessWithOutputLines("1"));
+ .assertSuccessWithOutputLines("1");
}
static class Main {
diff --git a/tools/linux/README.art-versions b/tools/linux/README.art-versions
index 94d78e1..5e38ebd 100644
--- a/tools/linux/README.art-versions
+++ b/tools/linux/README.art-versions
@@ -67,25 +67,29 @@
art-13 (Android T)
------------------
-Build from tm-dev commit 442e1091f39417c692d91609af05e58af60d8e2b.
+Build branch android-13.0.0_r3.
-repo sync -cq -j24
+export BRANCH=android-13.0.0_r3
+mkdir ${BRANCH}
+cd ${BRANCH}
+repo init -u https://android.googlesource.com/platform/manifest -b ${BRANCH}
+repo sync -cq -j48
source build/envsetup.sh
lunch aosp_redfin-userdebug
-m -j48
-m -j48 build-art
-m -j48 test-art-host
+USE_RBE=false m -j48
+USE_RBE=false m -j48 build-art
+USE_RBE=false m -j48 test-art-host
Collected into tools/linux/host/art-13. The "host" path element is checked
by the script for running Art.
cd <r8 checkout>
scripts/update-host-art.sh \
- --android-checkout <...>/android/tm-dev \
+ --android-checkout <...>/android-13.0.0_r3 \
--art-dir host/art-13 \
--android-product redfin
-(cd tools/linux/host; upload_to_google_storage.py -a --bucket r8-deps art-13)
+ (cd tools/linux/host; upload_to_google_storage.py -a --bucket r8-deps art-13)
art-12.0.0 (Android S)
---------------------
diff --git a/tools/linux/host/art-13-dev.tar.gz.sha1 b/tools/linux/host/art-13-dev.tar.gz.sha1
deleted file mode 100644
index 5367655..0000000
--- a/tools/linux/host/art-13-dev.tar.gz.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fed34a1eecaf012550cdd9df24434b8b2068a194
\ No newline at end of file
diff --git a/tools/linux/host/art-13.0.0.tar.gz.sha1 b/tools/linux/host/art-13.0.0.tar.gz.sha1
new file mode 100644
index 0000000..8ec439c
--- /dev/null
+++ b/tools/linux/host/art-13.0.0.tar.gz.sha1
@@ -0,0 +1 @@
+241ecc532b3bf804ef92bdb568ce7d4d85248434
\ No newline at end of file
