Fix windows DLL register

Author: nekohasekai

cmd/build-naive/cmd.go

@@ -34,15 +34,12 @@ var allTargets = []Target{
 	{OS: "win", CPU: "x64", GOOS: "windows", ARCH: "amd64"},
 	{OS: "win", CPU: "arm64", GOOS: "windows", ARCH: "arm64"},
 	{OS: "win", CPU: "x86", GOOS: "windows", ARCH: "386"},
-	// iOS
 	{OS: "ios", CPU: "arm64", GOOS: "ios", ARCH: "arm64", Platform: "iphoneos", Environment: "device"},
 	{OS: "ios", CPU: "arm64", GOOS: "ios", ARCH: "arm64", Platform: "iphoneos", Environment: "simulator"},
 	{OS: "ios", CPU: "x64", GOOS: "ios", ARCH: "amd64", Platform: "iphoneos", Environment: "simulator"},
-	// tvOS
 	{OS: "ios", CPU: "arm64", GOOS: "ios", ARCH: "arm64", Platform: "tvos", Environment: "device"},
 	{OS: "ios", CPU: "arm64", GOOS: "ios", ARCH: "arm64", Platform: "tvos", Environment: "simulator"},
 	{OS: "ios", CPU: "x64", GOOS: "ios", ARCH: "amd64", Platform: "tvos", Environment: "simulator"},
-	// Android
 	{OS: "android", CPU: "arm64", GOOS: "android", ARCH: "arm64"},
 	{OS: "android", CPU: "x64", GOOS: "android", ARCH: "amd64"},
 	{OS: "android", CPU: "arm", GOOS: "android", ARCH: "arm"},
@@ -71,7 +68,6 @@ func init() {
 }
 
 func preRun(cmd *cobra.Command, args []string) {
-	// Find project root (directory containing go.mod)
 	workingDirectory, err := os.Getwd()
 	if err != nil {
 		log.Fatalf("failed to get working directory: %v", err)
@@ -92,13 +88,11 @@ func preRun(cmd *cobra.Command, args []string) {
 }
 
 func parseTargets() []Target {
-	// Validate libc option
 	if libcStr != "" && libcStr != "glibc" && libcStr != "musl" {
 		log.Fatalf("invalid libc: %s (expected glibc or musl)", libcStr)
 	}
 
 	if targetStr == "" {
-		// Default to host platform
 		hostOS := runtime.GOOS
 		hostArch := runtime.GOARCH
 		for _, t := range allTargets {
@@ -135,7 +129,6 @@ func parseTargets() []Target {
 			continue
 		}
 
-		// Standard targets
 		if len(parts) != 2 {
 			log.Fatalf("invalid target format: %s (expected os/arch)", part)
 		}
@@ -171,7 +164,6 @@ func parseAppleTarget(goos, goarch string, parts []string) Target {
 		platform = "tvos"
 	}
 
-	// Determine environment
 	environment := "device"
 	if len(parts) == 3 && parts[2] == "simulator" {
 		environment = "simulator"
@@ -180,7 +172,6 @@ func parseAppleTarget(goos, goarch string, parts []string) Target {
 		environment = "simulator"
 	}
 
-	// Find matching target
 	for _, t := range allTargets {
 		if t.GOOS == "ios" && t.ARCH == goarch && t.Platform == platform && t.Environment == environment {
 			return t
@@ -191,13 +182,11 @@ func parseAppleTarget(goos, goarch string, parts []string) Target {
 	return Target{}
 }
 
-// applyLibc applies the --libc flag to a target
 func applyLibc(target Target) Target {
 	if libcStr == "" || libcStr == "glibc" {
 		return target
 	}
 
-	// musl is only supported on Linux
 	if target.GOOS != "linux" {
 		log.Fatalf("--libc=musl is only supported for Linux targets, not %s", target.GOOS)
 	}
@@ -208,7 +197,6 @@ func applyLibc(target Target) Target {
 	return target
 }
 
-// hostToCPU converts Go GOARCH to GN cpu
 func hostToCPU(goarch string) string {
 	switch goarch {
 	case "amd64":

cmd/build-naive/cmd_build.go

@@ -25,10 +25,8 @@ func init() {
 	mainCommand.AddCommand(commandBuild)
 }
 
-// formatTargetLog returns a human-readable log string for a target
 func formatTargetLog(t Target) string {
 	if t.Platform != "" {
-		// Apple platform with Platform/Environment
 		platformName := "iOS"
 		if t.Platform == "tvos" {
 			platformName = "tvOS"
@@ -44,10 +42,8 @@ func formatTargetLog(t Target) string {
 	return fmt.Sprintf("%s/%s", t.GOOS, t.ARCH)
 }
 
-// getOutputDirectory returns the GN output directory for a target
 func getOutputDirectory(t Target) string {
 	if t.Platform != "" {
-		// Apple platform: out/cronet-{platform}-{cpu}[-simulator]
 		directory := fmt.Sprintf("out/cronet-%s-%s", t.Platform, t.CPU)
 		if t.Environment == "simulator" {
 			directory += "-simulator"
@@ -68,7 +64,6 @@ func build(targets []Target) {
 	log.Print("Build complete!")
 }
 
-// getExtraFlags returns the EXTRA_FLAGS for a target
 func getExtraFlags(t Target) string {
 	flags := []string{
 		fmt.Sprintf(`target_os="%s"`, t.OS),
@@ -77,7 +72,6 @@ func getExtraFlags(t Target) string {
 	return strings.Join(flags, " ")
 }
 
-// OpenWrt SDK configuration for each architecture
 type openwrtConfig struct {
 	target    string // OpenWrt target (e.g., "x86", "armsr")
 	subtarget string // OpenWrt subtarget (e.g., "64", "generic")
@@ -86,10 +80,8 @@ type openwrtConfig struct {
 	gccVer    string // GCC version in SDK
 }
 
-// getOpenwrtConfig returns the OpenWrt SDK configuration for a target
 func getOpenwrtConfig(t Target) openwrtConfig {
 	// Use OpenWrt 23.05.5 as it's stable and widely available
-	// GCC version varies by release
 	switch t.CPU {
 	case "x64":
 		return openwrtConfig{
@@ -129,7 +121,6 @@ func getOpenwrtConfig(t Target) openwrtConfig {
 	}
 }
 
-// getOpenwrtFlags returns the OPENWRT_FLAGS environment variable value
 func getOpenwrtFlags(t Target) string {
 	config := getOpenwrtConfig(t)
 	return fmt.Sprintf(
@@ -138,7 +129,6 @@ func getOpenwrtFlags(t Target) string {
 	)
 }
 
-// runGetClang runs naiveproxy's get-clang.sh with appropriate EXTRA_FLAGS
 func runGetClang(t Target) {
 	// For cross-compilation on Linux, we need to also build host sysroot first
 	// because GN needs host sysroot in addition to target sysroot.
@@ -147,7 +137,6 @@ func runGetClang(t Target) {
 	hostCPU := hostToCPU(runtime.GOARCH)
 	needsHostSysroot := hostOS == "linux" && (t.OS == "linux" || t.OS == "android" || t.OS == "openwrt")
 	if needsHostSysroot {
-		// Run get-clang.sh with host target to ensure host sysroot is downloaded
 		hostFlags := fmt.Sprintf(`target_os="linux" target_cpu="%s"`, hostCPU)
 		log.Printf("Running get-clang.sh for host sysroot with EXTRA_FLAGS=%s", hostFlags)
 		command := exec.Command("bash", "./get-clang.sh")
@@ -160,7 +149,6 @@ func runGetClang(t Target) {
 			log.Fatalf("get-clang.sh (host) failed: %v", err)
 		}
 
-		// Create symlink for host sysroot so GN can find it at the default location
 		hostSysrootSource := filepath.Join(srcRoot, "out/sysroot-build/bullseye/bullseye_amd64_staging")
 		hostSysrootDestination := filepath.Join(srcRoot, "build/linux/debian_bullseye_amd64-sysroot")
 		if _, err := os.Stat(hostSysrootDestination); os.IsNotExist(err) {
@@ -175,7 +163,6 @@ func runGetClang(t Target) {
 	extraFlags := getExtraFlags(t)
 	env := []string{"EXTRA_FLAGS=" + extraFlags}
 
-	// For openwrt (musl), also set OPENWRT_FLAGS
 	if t.OS == "openwrt" {
 		openwrtFlags := getOpenwrtFlags(t)
 		env = append(env, "OPENWRT_FLAGS="+openwrtFlags)
@@ -196,12 +183,10 @@ func runGetClang(t Target) {
 }
 
 func buildTarget(t Target) {
-	// Run get-clang.sh to ensure toolchain is available
 	runGetClang(t)
 
 	outputDirectory := getOutputDirectory(t)
 
-	// Prepare GN args
 	args := []string{
 		"is_official_build=true",
 		"is_debug=false",
@@ -239,7 +224,6 @@ func buildTarget(t Target) {
 		fmt.Sprintf("target_cpu=\"%s\"", t.CPU),
 	}
 
-	// Platform-specific args
 	switch t.OS {
 	case "mac":
 		args = append(args, "use_sysroot=false")
@@ -257,7 +241,6 @@ func buildTarget(t Target) {
 			args = append(args, "use_cfi_icall=false", "is_cfi=false")
 		}
 	case "openwrt":
-		// OpenWrt uses musl libc
 		config := getOpenwrtConfig(t)
 		sysrootDirectory := fmt.Sprintf("out/sysroot-build/openwrt/%s/%s", config.release, config.arch)
 		args = append(args,
@@ -295,7 +278,6 @@ func buildTarget(t Target) {
 		)
 	}
 
-	// Detect and use ccache/sccache
 	if runtime.GOOS == "windows" {
 		sccachePath, _ := exec.LookPath("sccache")
 		if sccachePath != "" {
@@ -310,13 +292,11 @@ func buildTarget(t Target) {
 
 	gnArgs := strings.Join(args, " ")
 
-	// Determine GN path
 	gnPath := filepath.Join(srcRoot, "gn", "out", "gn")
 	if runtime.GOOS == "windows" {
 		gnPath += ".exe"
 	}
 
-	// Run gn gen
 	log.Printf("Running: gn gen %s", outputDirectory)
 	gnCommand := exec.Command(gnPath, "gen", outputDirectory, "--args="+gnArgs)
 	gnCommand.Dir = srcRoot
@@ -331,7 +311,6 @@ func buildTarget(t Target) {
 		log.Fatalf("gn gen failed: %v", err)
 	}
 
-	// Run ninja
 	if t.GOOS == "windows" {
 		// Windows: only build DLL (static linking not supported - Chromium uses MSVC, Go CGO only supports MinGW)
 		log.Printf("Running: ninja -C %s cronet", outputDirectory)

cmd/build-naive/cmd_cgo_flags.go

@@ -28,32 +28,24 @@ func init() {
 func printCGOFlags(t Target) {
 	outputDirectory := fmt.Sprintf("out/cronet-%s-%s", t.OS, t.CPU)
 
-	// Extract linking flags from ninja file
 	linkFlags, err := extractLinkFlags(outputDirectory)
 	if err != nil {
 		log.Fatalf("failed to extract link flags: %v", err)
 	}
 
 	var ldFlags []string
 
-	// Add static library reference
 	libraryDirectory := filepath.Join(projectRoot, "lib", getLibraryDirectoryName(t))
 	if t.GOOS == "darwin" || t.GOOS == "ios" {
 		ldFlags = append(ldFlags, filepath.Join(libraryDirectory, "libcronet.a"))
 	} else {
 		ldFlags = append(ldFlags, "-L"+libraryDirectory, "-l:libcronet.a")
 	}
 
-	// Add extracted ldflags (e.g., -Wl,-wrap,* for Android)
 	ldFlags = append(ldFlags, linkFlags.LDFlags...)
-
-	// Add extracted libs
 	ldFlags = append(ldFlags, linkFlags.Libs...)
-
-	// Add extracted frameworks
 	ldFlags = append(ldFlags, linkFlags.Frameworks...)
 
-	// Add Linux-specific flags
 	if t.GOOS == "linux" {
 		ldFlags = append(ldFlags, "-fuse-ld=lld")
 		// Add -no-pie for 32-bit (required for position-dependent code)

cmd/build-naive/cmd_env.go

@@ -24,7 +24,6 @@ func init() {
 	mainCommand.AddCommand(commandEnv)
 }
 
-// getClangTarget returns the clang target triple for a target
 func getClangTarget(t Target) string {
 	if t.Libc == "musl" {
 		switch t.CPU {
@@ -51,7 +50,6 @@ func getClangTarget(t Target) string {
 	return ""
 }
 
-// getSysrootPath returns the sysroot path for a target
 func getSysrootPath(t Target) string {
 	if t.Libc == "musl" {
 		config := getOpenwrtConfig(t)