cmd/geth: drop legacy android code
This commit is contained in:
		
							parent
							
								
									f15828e901
								
							
						
					
					
						commit
						b63138c3ec
					
				| @ -1,24 +0,0 @@ | ||||
| // Copyright 2015 The go-ethereum Authors
 | ||||
| // This file is part of go-ethereum.
 | ||||
| //
 | ||||
| // go-ethereum is free software: you can redistribute it and/or modify
 | ||||
| // it under the terms of the GNU General Public License as published by
 | ||||
| // the Free Software Foundation, either version 3 of the License, or
 | ||||
| // (at your option) any later version.
 | ||||
| //
 | ||||
| // go-ethereum is distributed in the hope that it will be useful,
 | ||||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of
 | ||||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 | ||||
| // GNU General Public License for more details.
 | ||||
| //
 | ||||
| // You should have received a copy of the GNU General Public License
 | ||||
| // along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
 | ||||
| 
 | ||||
| // Simple wrapper to translate the API exposed methods and types to inthernal
 | ||||
| // Go versions of the same types.
 | ||||
| 
 | ||||
| #include "_cgo_export.h" | ||||
| 
 | ||||
| int run(const char* args) { | ||||
|  return doRun((char*)args); | ||||
| } | ||||
| @ -1,46 +0,0 @@ | ||||
| // Copyright 2015 The go-ethereum Authors
 | ||||
| // This file is part of go-ethereum.
 | ||||
| //
 | ||||
| // go-ethereum is free software: you can redistribute it and/or modify
 | ||||
| // it under the terms of the GNU General Public License as published by
 | ||||
| // the Free Software Foundation, either version 3 of the License, or
 | ||||
| // (at your option) any later version.
 | ||||
| //
 | ||||
| // go-ethereum is distributed in the hope that it will be useful,
 | ||||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of
 | ||||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 | ||||
| // GNU General Public License for more details.
 | ||||
| //
 | ||||
| // You should have received a copy of the GNU General Public License
 | ||||
| // along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
 | ||||
| 
 | ||||
| // Contains a simple library definition to allow creating a Geth instance from
 | ||||
| // straight C code.
 | ||||
| 
 | ||||
| package main | ||||
| 
 | ||||
| // #ifdef __cplusplus
 | ||||
| // extern "C" {
 | ||||
| // #endif
 | ||||
| //
 | ||||
| // extern int run(const char*);
 | ||||
| //
 | ||||
| // #ifdef __cplusplus
 | ||||
| // }
 | ||||
| // #endif
 | ||||
| import "C" | ||||
| import ( | ||||
| 	"fmt" | ||||
| 	"os" | ||||
| 	"strings" | ||||
| ) | ||||
| 
 | ||||
| //export doRun
 | ||||
| func doRun(args *C.char) C.int { | ||||
| 	// This is equivalent to geth.main, just modified to handle the function arg passing
 | ||||
| 	if err := app.Run(strings.Split("geth "+C.GoString(args), " ")); err != nil { | ||||
| 		fmt.Fprintln(os.Stderr, err) | ||||
| 		return -1 | ||||
| 	} | ||||
| 	return 0 | ||||
| } | ||||
| @ -1,56 +0,0 @@ | ||||
| // Copyright 2015 The go-ethereum Authors
 | ||||
| // This file is part of go-ethereum.
 | ||||
| //
 | ||||
| // go-ethereum is free software: you can redistribute it and/or modify
 | ||||
| // it under the terms of the GNU General Public License as published by
 | ||||
| // the Free Software Foundation, either version 3 of the License, or
 | ||||
| // (at your option) any later version.
 | ||||
| //
 | ||||
| // go-ethereum is distributed in the hope that it will be useful,
 | ||||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of
 | ||||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 | ||||
| // GNU General Public License for more details.
 | ||||
| //
 | ||||
| // You should have received a copy of the GNU General Public License
 | ||||
| // along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
 | ||||
| 
 | ||||
| // Contains specialized code for running Geth on Android.
 | ||||
| 
 | ||||
| package main | ||||
| 
 | ||||
| // #include <android/log.h>
 | ||||
| // #cgo LDFLAGS: -llog
 | ||||
| import "C" | ||||
| import ( | ||||
| 	"bufio" | ||||
| 	"os" | ||||
| ) | ||||
| 
 | ||||
| func init() { | ||||
| 	// Redirect the standard output and error to logcat
 | ||||
| 	oldStdout, oldStderr := os.Stdout, os.Stderr | ||||
| 
 | ||||
| 	outRead, outWrite, _ := os.Pipe() | ||||
| 	errRead, errWrite, _ := os.Pipe() | ||||
| 
 | ||||
| 	os.Stdout = outWrite | ||||
| 	os.Stderr = errWrite | ||||
| 
 | ||||
| 	go func() { | ||||
| 		scanner := bufio.NewScanner(outRead) | ||||
| 		for scanner.Scan() { | ||||
| 			line := scanner.Text() | ||||
| 			C.__android_log_write(C.ANDROID_LOG_INFO, C.CString("Stdout"), C.CString(line)) | ||||
| 			oldStdout.WriteString(line + "\n") | ||||
| 		} | ||||
| 	}() | ||||
| 
 | ||||
| 	go func() { | ||||
| 		scanner := bufio.NewScanner(errRead) | ||||
| 		for scanner.Scan() { | ||||
| 			line := scanner.Text() | ||||
| 			C.__android_log_write(C.ANDROID_LOG_INFO, C.CString("Stderr"), C.CString(line)) | ||||
| 			oldStderr.WriteString(line + "\n") | ||||
| 		} | ||||
| 	}() | ||||
| } | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user