]> Cypherpunks repositories - gostls13.git/commitdiff
os: fix tests on brillo
authorBurcu Dogan <jbd@google.com>
Wed, 24 Feb 2016 19:58:57 +0000 (11:58 -0800)
committerBurcu Dogan <jbd@google.com>
Wed, 24 Feb 2016 21:05:40 +0000 (21:05 +0000)
Not every Android contains the /system/framework directory, e.g. Brillo.
Test against other Android-only system files.

Fixes #14489.

Change-Id: I6d9ec1c4d4ceba3803798015e6917d59cf515de8
Reviewed-on: https://go-review.googlesource.com/19904
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Burcu Dogan <jbd@google.com>
Run-TryBot: Burcu Dogan <jbd@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>

src/os/os_test.go

index 68f8f2b90a2418a965d446f64cf3306f3ec84616..b2f45b48f8dce7991207422d4b81cd4f97dfcdf0 100644 (file)
@@ -47,10 +47,10 @@ var sysdir = func() *sysDir {
        switch runtime.GOOS {
        case "android":
                return &sysDir{
-                       "/system/framework",
+                       "/system/lib",
                        []string{
-                               "ext.jar",
-                               "framework.jar",
+                               "libmedia.so",
+                               "libpowermanager.so",
                        },
                }
        case "darwin":