From: Burcu Dogan <jbd@google.com>
Date: Wed, 24 Feb 2016 19:58:57 +0000 (-0800)
Subject: os: fix tests on brillo
X-Git-Tag: go1.7beta1~1738
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=47b04228858e9a4a767acd12a029e59d582f3ba1;p=gostls13.git

os: fix tests on brillo

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>
---

diff --git a/src/os/os_test.go b/src/os/os_test.go
index 68f8f2b90a..b2f45b48f8 100644
--- a/src/os/os_test.go
+++ b/src/os/os_test.go
@@ -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":