diff --git a/app/internal/log/log.go b/app/internal/log/log.go deleted file mode 100644 index 731ae492..00000000 --- a/app/internal/log/log.go +++ /dev/null @@ -1,7 +0,0 @@ -// SPDX-License-Identifier: Unlicense OR MIT - -// Package points standard output, standard error and the standard -// library package log to the platform logger. -package log - -var appID = "gio" diff --git a/app/internal/log/log_android.go b/app/log_android.go similarity index 97% rename from app/internal/log/log_android.go rename to app/log_android.go index 1245598a..6318b08b 100644 --- a/app/internal/log/log_android.go +++ b/app/log_android.go @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Unlicense OR MIT -package log +package app /* #cgo LDFLAGS: -llog @@ -22,7 +22,7 @@ import ( // 1024 is the truncation limit from android/log.h, plus a \n. const logLineLimit = 1024 -var logTag = C.CString(appID) +var logTag = C.CString(ID) func init() { // Android's logcat already includes timestamps. diff --git a/app/internal/log/log_ios.go b/app/log_ios.go similarity index 98% rename from app/internal/log/log_ios.go rename to app/log_ios.go index cad4e19d..82c0f1fe 100644 --- a/app/internal/log/log_ios.go +++ b/app/log_ios.go @@ -3,7 +3,7 @@ //go:build darwin && ios // +build darwin,ios -package log +package app /* #cgo CFLAGS: -Werror -fmodules -fobjc-arc -x objective-c diff --git a/app/internal/log/log_windows.go b/app/log_windows.go similarity index 98% rename from app/internal/log/log_windows.go rename to app/log_windows.go index 13c5fe4d..f6f654cf 100644 --- a/app/internal/log/log_windows.go +++ b/app/log_windows.go @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Unlicense OR MIT -package log +package app import ( "log" diff --git a/app/window.go b/app/window.go index 62a0a2bd..fe2fd664 100644 --- a/app/window.go +++ b/app/window.go @@ -28,8 +28,6 @@ import ( "gioui.org/unit" "gioui.org/widget" "gioui.org/widget/material" - - _ "gioui.org/app/internal/log" ) // Option configures a window.