mobile: fix CopyFile switch to package cp

This commit is contained in:
Péter Szilágyi 2019-11-18 22:06:28 +02:00
parent 8bd5bb8918
commit f8790b9482
No known key found for this signature in database
GPG Key ID: E9AE538CEDF8293D

View File

@ -25,7 +25,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/ethereum/go-ethereum/internal/build" "github.com/cespare/cp"
) )
// androidTestClass is a Java class to do some lightweight tests against the Android // androidTestClass is a Java class to do some lightweight tests against the Android
@ -212,7 +212,7 @@ func TestAndroid(t *testing.T) {
t.Logf("%s", output) t.Logf("%s", output)
t.Fatalf("failed to run gomobile bind: %v", err) t.Fatalf("failed to run gomobile bind: %v", err)
} }
build.CopyFile(filepath.Join("libs", "geth.aar"), "geth.aar", os.ModePerm) cp.CopyFile(filepath.Join("libs", "geth.aar"), "geth.aar")
if err = ioutil.WriteFile(filepath.Join("src", "androidTest", "java", "org", "ethereum", "gethtest", "AndroidTest.java"), []byte(androidTestClass), os.ModePerm); err != nil { if err = ioutil.WriteFile(filepath.Join("src", "androidTest", "java", "org", "ethereum", "gethtest", "AndroidTest.java"), []byte(androidTestClass), os.ModePerm); err != nil {
t.Fatalf("failed to write Android test class: %v", err) t.Fatalf("failed to write Android test class: %v", err)