[roll] Roll Global Integration
GitOrigin-RevId: cf1cca748fc0114f7b53906238bc3c53f0c1fbe1
Change-Id: Id2512957ab9ce39cecafedc95047268170c8bff3
diff --git a/ctf/all b/ctf/all
index eee0648..cd5274f 100644
--- a/ctf/all
+++ b/ctf/all
@@ -7,5 +7,6 @@
<localimport file="f23"/>
<localimport file="f24"/>
<localimport file="f25"/>
+ <localimport file="f26"/>
</imports>
</manifest>
diff --git a/ctf/f26 b/ctf/f26
new file mode 100644
index 0000000..eb929c1
--- /dev/null
+++ b/ctf/f26
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+ <packages>
+ <!-- Versioned CTF release. See ctf_generate_manifest.py for details. -->
+ <package name="fuchsia/cts/${platform}"
+ path="prebuilt/ctf/f26/{{.OS}}-{{.Arch}}"
+ platforms="linux-amd64"
+ version="git_revision:3c3e710cb180fc9e78969e9fac8b7a60eea049a2" />
+ <package name="fuchsia/sdk/core/${platform}"
+ path="prebuilt/ctf/f26/{{.OS}}-{{.Arch}}/sdk"
+ platforms="linux-amd64"
+ attributes="ctf-host-tools"
+ version="f26" />
+ <package name="fuchsia/development/product_bundles/v2"
+ path="prebuilt/ctf/f26/{{.OS}}-{{.Arch}}/product_bundles"
+ platforms="linux-amd64"
+ attributes="ctf-host-tools"
+ version="f26" />
+ </packages>
+</manifest>
\ No newline at end of file
diff --git a/jiri.lock b/jiri.lock
index 237fc53..84fc16d 100644
--- a/jiri.lock
+++ b/jiri.lock
@@ -82,6 +82,12 @@
},
{
"package": "fuchsia/cts/linux-amd64",
+ "path": "prebuilt/ctf/f26/{{.OS}}-{{.Arch}}",
+ "version": "git_revision:3c3e710cb180fc9e78969e9fac8b7a60eea049a2",
+ "instance_id": "F9SOyRS_P1mr1eqYNXStd1qEgVYNF0e5oK84Snv8d5AC"
+ },
+ {
+ "package": "fuchsia/cts/linux-amd64",
"path": "prebuilt/cts/current_milestone/{{.OS}}-{{.Arch}}",
"version": "git_revision:e8c6aaac3a30f419440ea7d01ed16f5f8c9f4b2c",
"instance_id": "QSk2CFbuUDlrRsrsL5zLTGRP1yD_fUfy1_H5Z9FQpmwC"
@@ -138,6 +144,12 @@
"instance_id": "hMP3bdzdAKIua7oUsuA4zHXcPk-82BBB9LT2TMJ4WhYC"
},
{
+ "package": "fuchsia/development/product_bundles/v2",
+ "path": "prebuilt/ctf/f26/{{.OS}}-{{.Arch}}/product_bundles",
+ "version": "f26",
+ "instance_id": "-VKhgggwaB-uOSVcbKyeQrp4G1OV_R10yqUgV4hEo3kC"
+ },
+ {
"package": "fuchsia/drivers/backlight/debug-symbols-x64",
"version": "git_revision:25091161bc0a5750540ff2c4b73862e746d8c225",
"instance_id": "YOP9781kkip-kcVAVc652wCVebx99esWg7ZO0tFEV6sC"
@@ -399,6 +411,12 @@
"instance_id": "F8IOuk4fcnZkqHMLmFbUDEeX-tkQPIFkCwykHrS9C3UC"
},
{
+ "package": "fuchsia/sdk/core/linux-amd64",
+ "path": "prebuilt/ctf/f26/{{.OS}}-{{.Arch}}/sdk",
+ "version": "f26",
+ "instance_id": "9tkhB8pELeuGuFGnV9fz-rLzYrIW2PJDCNJhCC6_ekEC"
+ },
+ {
"package": "fuchsia/shac/linux-amd64",
"version": "git_revision:bf297ac0d953130343d4be68ddec06ac3b1897c2",
"instance_id": "xkBvZTm9CcAQ8sBDqei3ZePnlg6heczIRN54w6J23J8C"
