Colin Cross | fb6d781 | 2019-01-09 22:17:55 -0800 | [diff] [blame] | 1 | // Copyright 2019 Google Inc. All rights reserved. |
| 2 | // |
| 3 | // Licensed under the Apache License, Version 2.0 (the "License"); |
| 4 | // you may not use this file except in compliance with the License. |
| 5 | // You may obtain a copy of the License at |
| 6 | // |
| 7 | // http://www.apache.org/licenses/LICENSE-2.0 |
| 8 | // |
| 9 | // Unless required by applicable law or agreed to in writing, software |
| 10 | // distributed under the License is distributed on an "AS IS" BASIS, |
| 11 | // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 12 | // See the License for the specific language governing permissions and |
| 13 | // limitations under the License. |
| 14 | |
| 15 | package java |
| 16 | |
| 17 | import ( |
Colin Cross | fb6d781 | 2019-01-09 22:17:55 -0800 | [diff] [blame] | 18 | "path/filepath" |
| 19 | "reflect" |
| 20 | "strings" |
| 21 | "testing" |
| 22 | |
| 23 | "github.com/google/blueprint/proptools" |
Colin Cross | 60405e5 | 2019-04-18 12:31:22 -0700 | [diff] [blame] | 24 | |
| 25 | "android/soong/android" |
| 26 | "android/soong/java/config" |
Colin Cross | fb6d781 | 2019-01-09 22:17:55 -0800 | [diff] [blame] | 27 | ) |
| 28 | |
Colin Cross | fb6d781 | 2019-01-09 22:17:55 -0800 | [diff] [blame] | 29 | func TestClasspath(t *testing.T) { |
Colin Cross | 3047fa2 | 2019-04-18 10:56:44 -0700 | [diff] [blame] | 30 | var classpathTestcases = []struct { |
| 31 | name string |
| 32 | unbundled bool |
| 33 | pdk bool |
| 34 | moduleType string |
| 35 | host android.OsClass |
| 36 | properties string |
| 37 | bootclasspath []string |
| 38 | system string |
| 39 | classpath []string |
| 40 | aidl string |
| 41 | }{ |
| 42 | { |
| 43 | name: "default", |
| 44 | bootclasspath: config.DefaultBootclasspathLibraries, |
| 45 | system: config.DefaultSystemModules, |
| 46 | classpath: config.DefaultLibraries, |
| 47 | aidl: "-Iframework/aidl", |
| 48 | }, |
| 49 | { |
Paul Duffin | 50c217c | 2019-06-12 13:25:22 +0100 | [diff] [blame] | 50 | name: `sdk_version:"core_platform"`, |
| 51 | properties: `sdk_version:"core_platform"`, |
| 52 | bootclasspath: config.DefaultBootclasspathLibraries, |
| 53 | system: config.DefaultSystemModules, |
| 54 | classpath: []string{}, |
| 55 | aidl: "", |
| 56 | }, |
| 57 | { |
Colin Cross | 3047fa2 | 2019-04-18 10:56:44 -0700 | [diff] [blame] | 58 | name: "blank sdk version", |
| 59 | properties: `sdk_version: "",`, |
| 60 | bootclasspath: config.DefaultBootclasspathLibraries, |
| 61 | system: config.DefaultSystemModules, |
| 62 | classpath: config.DefaultLibraries, |
| 63 | aidl: "-Iframework/aidl", |
| 64 | }, |
| 65 | { |
| 66 | |
| 67 | name: "sdk v25", |
| 68 | properties: `sdk_version: "25",`, |
| 69 | bootclasspath: []string{`""`}, |
| 70 | system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath |
| 71 | classpath: []string{"prebuilts/sdk/25/public/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"}, |
| 72 | aidl: "-pprebuilts/sdk/25/public/framework.aidl", |
| 73 | }, |
| 74 | { |
| 75 | |
| 76 | name: "current", |
| 77 | properties: `sdk_version: "current",`, |
| 78 | bootclasspath: []string{"android_stubs_current", "core-lambda-stubs"}, |
| 79 | system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath |
| 80 | aidl: "-p" + buildDir + "/framework.aidl", |
| 81 | }, |
| 82 | { |
| 83 | |
| 84 | name: "system_current", |
| 85 | properties: `sdk_version: "system_current",`, |
| 86 | bootclasspath: []string{"android_system_stubs_current", "core-lambda-stubs"}, |
| 87 | system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath |
| 88 | aidl: "-p" + buildDir + "/framework.aidl", |
| 89 | }, |
| 90 | { |
| 91 | |
| 92 | name: "system_25", |
| 93 | properties: `sdk_version: "system_25",`, |
| 94 | bootclasspath: []string{`""`}, |
| 95 | system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath |
| 96 | classpath: []string{"prebuilts/sdk/25/system/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"}, |
| 97 | aidl: "-pprebuilts/sdk/25/public/framework.aidl", |
| 98 | }, |
| 99 | { |
| 100 | |
| 101 | name: "test_current", |
| 102 | properties: `sdk_version: "test_current",`, |
| 103 | bootclasspath: []string{"android_test_stubs_current", "core-lambda-stubs"}, |
| 104 | system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath |
| 105 | aidl: "-p" + buildDir + "/framework.aidl", |
| 106 | }, |
| 107 | { |
| 108 | |
| 109 | name: "core_current", |
| 110 | properties: `sdk_version: "core_current",`, |
| 111 | bootclasspath: []string{"core.current.stubs", "core-lambda-stubs"}, |
| 112 | system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath |
| 113 | }, |
| 114 | { |
| 115 | |
Paul Duffin | 52d398a | 2019-06-11 12:31:14 +0100 | [diff] [blame] | 116 | name: "nostdlib", |
| 117 | properties: `sdk_version: "none", system_modules: "none"`, |
| 118 | system: "none", |
| 119 | bootclasspath: []string{`""`}, |
| 120 | classpath: []string{}, |
| 121 | }, |
| 122 | { |
| 123 | |
Paul Duffin | 52d398a | 2019-06-11 12:31:14 +0100 | [diff] [blame] | 124 | name: "nostdlib system_modules", |
| 125 | properties: `sdk_version: "none", system_modules: "core-platform-api-stubs-system-modules"`, |
| 126 | system: "core-platform-api-stubs-system-modules", |
Paul Duffin | 68289b0 | 2019-09-20 13:50:52 +0100 | [diff] [blame] | 127 | bootclasspath: []string{"core-platform-api-stubs-system-modules-lib"}, |
Paul Duffin | 52d398a | 2019-06-11 12:31:14 +0100 | [diff] [blame] | 128 | classpath: []string{}, |
| 129 | }, |
| 130 | { |
| 131 | |
Colin Cross | 3047fa2 | 2019-04-18 10:56:44 -0700 | [diff] [blame] | 132 | name: "host default", |
| 133 | moduleType: "java_library_host", |
| 134 | properties: ``, |
| 135 | host: android.Host, |
| 136 | bootclasspath: []string{"jdk8/jre/lib/jce.jar", "jdk8/jre/lib/rt.jar"}, |
| 137 | classpath: []string{}, |
| 138 | }, |
| 139 | { |
Colin Cross | 3047fa2 | 2019-04-18 10:56:44 -0700 | [diff] [blame] | 140 | |
| 141 | name: "host supported default", |
| 142 | host: android.Host, |
| 143 | properties: `host_supported: true,`, |
| 144 | classpath: []string{}, |
| 145 | bootclasspath: []string{"jdk8/jre/lib/jce.jar", "jdk8/jre/lib/rt.jar"}, |
| 146 | }, |
| 147 | { |
Paul Duffin | 52d398a | 2019-06-11 12:31:14 +0100 | [diff] [blame] | 148 | name: "host supported nostdlib", |
| 149 | host: android.Host, |
| 150 | properties: `host_supported: true, sdk_version: "none", system_modules: "none"`, |
| 151 | classpath: []string{}, |
| 152 | }, |
| 153 | { |
Colin Cross | 3047fa2 | 2019-04-18 10:56:44 -0700 | [diff] [blame] | 154 | |
| 155 | name: "unbundled sdk v25", |
| 156 | unbundled: true, |
| 157 | properties: `sdk_version: "25",`, |
| 158 | bootclasspath: []string{`""`}, |
| 159 | system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath |
| 160 | classpath: []string{"prebuilts/sdk/25/public/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"}, |
| 161 | aidl: "-pprebuilts/sdk/25/public/framework.aidl", |
| 162 | }, |
| 163 | { |
| 164 | |
| 165 | name: "unbundled current", |
| 166 | unbundled: true, |
| 167 | properties: `sdk_version: "current",`, |
| 168 | bootclasspath: []string{`""`}, |
| 169 | system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath |
| 170 | classpath: []string{"prebuilts/sdk/current/public/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"}, |
| 171 | aidl: "-pprebuilts/sdk/current/public/framework.aidl", |
| 172 | }, |
| 173 | |
| 174 | { |
| 175 | name: "pdk default", |
| 176 | pdk: true, |
| 177 | bootclasspath: []string{`""`}, |
| 178 | system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath |
| 179 | classpath: []string{"prebuilts/sdk/25/public/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"}, |
| 180 | aidl: "-pprebuilts/sdk/25/public/framework.aidl", |
| 181 | }, |
| 182 | { |
| 183 | name: "pdk current", |
| 184 | pdk: true, |
| 185 | properties: `sdk_version: "current",`, |
| 186 | bootclasspath: []string{`""`}, |
| 187 | system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath |
| 188 | classpath: []string{"prebuilts/sdk/25/public/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"}, |
| 189 | aidl: "-pprebuilts/sdk/25/public/framework.aidl", |
| 190 | }, |
| 191 | { |
| 192 | name: "pdk 25", |
| 193 | pdk: true, |
| 194 | properties: `sdk_version: "25",`, |
| 195 | bootclasspath: []string{`""`}, |
| 196 | system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath |
| 197 | classpath: []string{"prebuilts/sdk/25/public/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"}, |
| 198 | aidl: "-pprebuilts/sdk/25/public/framework.aidl", |
| 199 | }, |
| 200 | } |
| 201 | |
Colin Cross | fb6d781 | 2019-01-09 22:17:55 -0800 | [diff] [blame] | 202 | for _, testcase := range classpathTestcases { |
| 203 | t.Run(testcase.name, func(t *testing.T) { |
| 204 | moduleType := "java_library" |
| 205 | if testcase.moduleType != "" { |
| 206 | moduleType = testcase.moduleType |
| 207 | } |
| 208 | |
Pete Gillin | bdf5d71 | 2019-10-21 14:29:58 +0100 | [diff] [blame] | 209 | props := ` |
Colin Cross | fb6d781 | 2019-01-09 22:17:55 -0800 | [diff] [blame] | 210 | name: "foo", |
| 211 | srcs: ["a.java"], |
Colin Cross | 3047fa2 | 2019-04-18 10:56:44 -0700 | [diff] [blame] | 212 | target: { |
| 213 | android: { |
| 214 | srcs: ["bar-doc/IFoo.aidl"], |
| 215 | }, |
| 216 | }, |
Pete Gillin | bdf5d71 | 2019-10-21 14:29:58 +0100 | [diff] [blame] | 217 | ` |
| 218 | bp := moduleType + " {" + props + testcase.properties + ` |
| 219 | }` |
| 220 | bpJava8 := moduleType + " {" + props + `java_version: "1.8", |
Colin Cross | fb6d781 | 2019-01-09 22:17:55 -0800 | [diff] [blame] | 221 | ` + testcase.properties + ` |
| 222 | }` |
| 223 | |
| 224 | variant := "android_common" |
| 225 | if testcase.host == android.Host { |
| 226 | variant = android.BuildOs.String() + "_common" |
| 227 | } |
| 228 | |
| 229 | convertModulesToPaths := func(cp []string) []string { |
| 230 | ret := make([]string, len(cp)) |
| 231 | for i, e := range cp { |
| 232 | ret[i] = moduleToPath(e) |
| 233 | } |
| 234 | return ret |
| 235 | } |
| 236 | |
| 237 | bootclasspath := convertModulesToPaths(testcase.bootclasspath) |
| 238 | classpath := convertModulesToPaths(testcase.classpath) |
| 239 | |
Pete Gillin | bdf5d71 | 2019-10-21 14:29:58 +0100 | [diff] [blame] | 240 | bc := "" |
| 241 | var bcDeps []string |
| 242 | if len(bootclasspath) > 0 { |
| 243 | bc = "-bootclasspath " + strings.Join(bootclasspath, ":") |
| 244 | if bootclasspath[0] != `""` { |
| 245 | bcDeps = bootclasspath |
| 246 | } |
Colin Cross | fb6d781 | 2019-01-09 22:17:55 -0800 | [diff] [blame] | 247 | } |
| 248 | |
Pete Gillin | bdf5d71 | 2019-10-21 14:29:58 +0100 | [diff] [blame] | 249 | c := "" |
| 250 | if len(classpath) > 0 { |
| 251 | c = "-classpath " + strings.Join(classpath, ":") |
Colin Cross | fb6d781 | 2019-01-09 22:17:55 -0800 | [diff] [blame] | 252 | } |
Pete Gillin | bdf5d71 | 2019-10-21 14:29:58 +0100 | [diff] [blame] | 253 | |
Colin Cross | fb6d781 | 2019-01-09 22:17:55 -0800 | [diff] [blame] | 254 | system := "" |
Pete Gillin | bdf5d71 | 2019-10-21 14:29:58 +0100 | [diff] [blame] | 255 | var systemDeps []string |
Colin Cross | fb6d781 | 2019-01-09 22:17:55 -0800 | [diff] [blame] | 256 | if testcase.system == "none" { |
| 257 | system = "--system=none" |
Pete Gillin | bdf5d71 | 2019-10-21 14:29:58 +0100 | [diff] [blame] | 258 | } else if testcase.system == "bootclasspath" { |
| 259 | system = bc |
| 260 | systemDeps = bcDeps |
Colin Cross | fb6d781 | 2019-01-09 22:17:55 -0800 | [diff] [blame] | 261 | } else if testcase.system != "" { |
Dan Willemsen | ff60a73 | 2019-06-13 16:52:01 +0000 | [diff] [blame] | 262 | system = "--system=" + filepath.Join(buildDir, ".intermediates", testcase.system, "android_common", "system") |
Pete Gillin | bdf5d71 | 2019-10-21 14:29:58 +0100 | [diff] [blame] | 263 | // The module-relative parts of these paths are hardcoded in system_modules.go: |
| 264 | systemDeps = []string{ |
| 265 | filepath.Join(buildDir, ".intermediates", testcase.system, "android_common", "system", "lib", "modules"), |
| 266 | filepath.Join(buildDir, ".intermediates", testcase.system, "android_common", "system", "lib", "jrt-fs.jar"), |
| 267 | filepath.Join(buildDir, ".intermediates", testcase.system, "android_common", "system", "release"), |
| 268 | } |
Colin Cross | fb6d781 | 2019-01-09 22:17:55 -0800 | [diff] [blame] | 269 | } |
| 270 | |
Pete Gillin | bdf5d71 | 2019-10-21 14:29:58 +0100 | [diff] [blame] | 271 | checkClasspath := func(t *testing.T, ctx *android.TestContext, isJava8 bool) { |
Colin Cross | c080617 | 2019-06-14 18:51:47 -0700 | [diff] [blame] | 272 | foo := ctx.ModuleForTests("foo", variant) |
| 273 | javac := foo.Rule("javac") |
Pete Gillin | bdf5d71 | 2019-10-21 14:29:58 +0100 | [diff] [blame] | 274 | var deps []string |
Colin Cross | c080617 | 2019-06-14 18:51:47 -0700 | [diff] [blame] | 275 | |
| 276 | aidl := foo.MaybeRule("aidl") |
Pete Gillin | bdf5d71 | 2019-10-21 14:29:58 +0100 | [diff] [blame] | 277 | if aidl.Rule != nil { |
| 278 | deps = append(deps, aidl.Output.String()) |
| 279 | } |
Colin Cross | fb6d781 | 2019-01-09 22:17:55 -0800 | [diff] [blame] | 280 | |
| 281 | got := javac.Args["bootClasspath"] |
Pete Gillin | bdf5d71 | 2019-10-21 14:29:58 +0100 | [diff] [blame] | 282 | expected := "" |
| 283 | if isJava8 { |
| 284 | expected = bc |
| 285 | deps = append(deps, bcDeps...) |
| 286 | } else { |
| 287 | expected = system |
| 288 | deps = append(deps, systemDeps...) |
| 289 | } |
| 290 | if got != expected { |
| 291 | t.Errorf("bootclasspath expected %q != got %q", expected, got) |
Colin Cross | fb6d781 | 2019-01-09 22:17:55 -0800 | [diff] [blame] | 292 | } |
| 293 | |
| 294 | got = javac.Args["classpath"] |
| 295 | if got != c { |
| 296 | t.Errorf("classpath expected %q != got %q", c, got) |
| 297 | } |
Colin Cross | fb6d781 | 2019-01-09 22:17:55 -0800 | [diff] [blame] | 298 | deps = append(deps, classpath...) |
| 299 | |
| 300 | if !reflect.DeepEqual(javac.Implicits.Strings(), deps) { |
| 301 | t.Errorf("implicits expected %q != got %q", deps, javac.Implicits.Strings()) |
| 302 | } |
Colin Cross | 3047fa2 | 2019-04-18 10:56:44 -0700 | [diff] [blame] | 303 | } |
| 304 | |
Pete Gillin | 1b3370f | 2019-10-01 13:57:31 +0100 | [diff] [blame] | 305 | // Test with legacy javac -source 1.8 -target 1.8 |
Pete Gillin | 0c2143e | 2019-05-02 15:32:11 +0100 | [diff] [blame] | 306 | t.Run("Java language level 8", func(t *testing.T) { |
Pete Gillin | bdf5d71 | 2019-10-21 14:29:58 +0100 | [diff] [blame] | 307 | config := testConfig(nil) |
Colin Cross | 3047fa2 | 2019-04-18 10:56:44 -0700 | [diff] [blame] | 308 | if testcase.unbundled { |
| 309 | config.TestProductVariables.Unbundled_build = proptools.BoolPtr(true) |
| 310 | } |
| 311 | if testcase.pdk { |
| 312 | config.TestProductVariables.Pdk = proptools.BoolPtr(true) |
| 313 | } |
Pete Gillin | bdf5d71 | 2019-10-21 14:29:58 +0100 | [diff] [blame] | 314 | ctx := testContext(bpJava8, nil) |
Colin Cross | 3047fa2 | 2019-04-18 10:56:44 -0700 | [diff] [blame] | 315 | run(t, ctx, config) |
| 316 | |
Pete Gillin | bdf5d71 | 2019-10-21 14:29:58 +0100 | [diff] [blame] | 317 | checkClasspath(t, ctx, true /* isJava8 */) |
Colin Cross | 3047fa2 | 2019-04-18 10:56:44 -0700 | [diff] [blame] | 318 | |
| 319 | if testcase.host != android.Host { |
| 320 | aidl := ctx.ModuleForTests("foo", variant).Rule("aidl") |
| 321 | |
Colin Cross | c080617 | 2019-06-14 18:51:47 -0700 | [diff] [blame] | 322 | if g, w := aidl.RuleParams.Command, testcase.aidl+" -I."; !strings.Contains(g, w) { |
| 323 | t.Errorf("want aidl command to contain %q, got %q", w, g) |
Colin Cross | 3047fa2 | 2019-04-18 10:56:44 -0700 | [diff] [blame] | 324 | } |
| 325 | } |
Colin Cross | fb6d781 | 2019-01-09 22:17:55 -0800 | [diff] [blame] | 326 | }) |
| 327 | |
Pete Gillin | 1b3370f | 2019-10-01 13:57:31 +0100 | [diff] [blame] | 328 | // Test with default javac -source 9 -target 9 |
Pete Gillin | 0c2143e | 2019-05-02 15:32:11 +0100 | [diff] [blame] | 329 | t.Run("Java language level 9", func(t *testing.T) { |
Pete Gillin | 1b3370f | 2019-10-01 13:57:31 +0100 | [diff] [blame] | 330 | config := testConfig(nil) |
Colin Cross | fb6d781 | 2019-01-09 22:17:55 -0800 | [diff] [blame] | 331 | if testcase.unbundled { |
| 332 | config.TestProductVariables.Unbundled_build = proptools.BoolPtr(true) |
| 333 | } |
Colin Cross | 98fd574 | 2019-01-09 23:04:25 -0800 | [diff] [blame] | 334 | if testcase.pdk { |
| 335 | config.TestProductVariables.Pdk = proptools.BoolPtr(true) |
| 336 | } |
Jaewoong Jung | f9a0443 | 2019-07-17 11:15:09 -0700 | [diff] [blame] | 337 | ctx := testContext(bp, nil) |
Colin Cross | fb6d781 | 2019-01-09 22:17:55 -0800 | [diff] [blame] | 338 | run(t, ctx, config) |
| 339 | |
Pete Gillin | bdf5d71 | 2019-10-21 14:29:58 +0100 | [diff] [blame] | 340 | checkClasspath(t, ctx, false /* isJava8 */) |
| 341 | |
| 342 | if testcase.host != android.Host { |
| 343 | aidl := ctx.ModuleForTests("foo", variant).Rule("aidl") |
| 344 | |
| 345 | if g, w := aidl.RuleParams.Command, testcase.aidl+" -I."; !strings.Contains(g, w) { |
| 346 | t.Errorf("want aidl command to contain %q, got %q", w, g) |
| 347 | } |
Colin Cross | fb6d781 | 2019-01-09 22:17:55 -0800 | [diff] [blame] | 348 | } |
| 349 | }) |
Colin Cross | ff0daf4 | 2019-04-02 16:10:56 -0700 | [diff] [blame] | 350 | |
Pete Gillin | bdf5d71 | 2019-10-21 14:29:58 +0100 | [diff] [blame] | 351 | // Test again with PLATFORM_VERSION_CODENAME=REL, javac -source 8 -target 8 |
| 352 | t.Run("REL + Java language level 8", func(t *testing.T) { |
| 353 | config := testConfig(nil) |
Colin Cross | ff0daf4 | 2019-04-02 16:10:56 -0700 | [diff] [blame] | 354 | config.TestProductVariables.Platform_sdk_codename = proptools.StringPtr("REL") |
| 355 | config.TestProductVariables.Platform_sdk_final = proptools.BoolPtr(true) |
| 356 | |
| 357 | if testcase.unbundled { |
| 358 | config.TestProductVariables.Unbundled_build = proptools.BoolPtr(true) |
| 359 | } |
| 360 | if testcase.pdk { |
| 361 | config.TestProductVariables.Pdk = proptools.BoolPtr(true) |
| 362 | } |
Pete Gillin | bdf5d71 | 2019-10-21 14:29:58 +0100 | [diff] [blame] | 363 | ctx := testContext(bpJava8, nil) |
Colin Cross | ff0daf4 | 2019-04-02 16:10:56 -0700 | [diff] [blame] | 364 | run(t, ctx, config) |
| 365 | |
Pete Gillin | bdf5d71 | 2019-10-21 14:29:58 +0100 | [diff] [blame] | 366 | checkClasspath(t, ctx, true /* isJava8 */) |
Colin Cross | ff0daf4 | 2019-04-02 16:10:56 -0700 | [diff] [blame] | 367 | }) |
Pete Gillin | bdf5d71 | 2019-10-21 14:29:58 +0100 | [diff] [blame] | 368 | |
| 369 | // TODO(b/142896162): Add a with PLATFORM_VERSION_CODENAME=REL, javac -source 9 -target 9, when that all works. |
Colin Cross | fb6d781 | 2019-01-09 22:17:55 -0800 | [diff] [blame] | 370 | }) |
| 371 | } |
| 372 | |
| 373 | } |