Skip to content

Commit c6794c9

Browse files
hajimehoshigopherbot
authored andcommitted
asset: do not use 'assets' directory for iOS
The iOS implementation was just copied from the desktop version, and had and extra directory 'assets'. Also, files had an incorrect assumption that Arm Darwin should be an iOS. This change addresses these issues. Fixes golang/go#37177 Change-Id: I8e4de5337fbbe0b7697a8d519c8bded783399244 Reviewed-on: https://go-review.googlesource.com/c/mobile/+/616655 Reviewed-by: Dmitri Shuralyov <[email protected]> Auto-Submit: Hyang-Ah Hana Kim <[email protected]> Reviewed-by: Hyang-Ah Hana Kim <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]>
1 parent 6429502 commit c6794c9

File tree

3 files changed

+14
-24
lines changed

3 files changed

+14
-24
lines changed

asset/asset_darwin_armx.go

-23
This file was deleted.

asset/asset_desktop.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style
33
// license that can be found in the LICENSE file.
44

5-
//go:build (linux && !android) || (darwin && !arm && !arm64) || windows
5+
//go:build (linux && !android) || (darwin && !ios) || windows
66

77
package asset
88

asset/asset_ios.go

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// Copyright 2024 The Go Authors. All rights reserved.
2+
// Use of this source code is governed by a BSD-style
3+
// license that can be found in the LICENSE file.
4+
5+
package asset
6+
7+
import (
8+
"os"
9+
)
10+
11+
func openAsset(name string) (File, error) {
12+
return os.Open(name)
13+
}

0 commit comments

Comments
 (0)