StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unnecessary snake case variables.

Browse Source 
Test: m nothing + TreeHugger
Change-Id: I99f7162944daa6c57c6ae4763261e108bb5cb6b1
This commit is contained in:
Jaewoong Jung
2020-12-21 09:11:10 -08:00
parent 1f8c272984
commit 18aefc1977
33 changed files with 204 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
androidmk/androidmk/android.go
View File

@@ -24,8 +24,8 @@ import (
)
const (
clear_vars = "__android_mk_clear_vars"
include_ignored = "__android_mk_include_ignored"
clearVarsPath = "__android_mk_clear_vars"
includeIgnoredPath = "__android_mk_include_ignored"
)
type bpVariable struct {
@@ -913,7 +913,7 @@ func allSubdirJavaFiles(args []string) []string {
}
func includeIgnored(args []string) []string {
return []string{include_ignored}
return []string{includeIgnoredPath}
}
var moduleTypes = map[string]string{
@@ -959,7 +959,7 @@ var includePathToModule = map[string]string{
}
func mapIncludePath(path string) (string, bool) {
if path == clear_vars || path == include_ignored {
if path == clearVarsPath || path == includeIgnoredPath {
return path, true
}
module, ok := includePathToModule[path]
@@ -968,7 +968,7 @@ func mapIncludePath(path string) (string, bool) {
func androidScope() mkparser.Scope {
globalScope := mkparser.NewScope(nil)
globalScope.Set("CLEAR_VARS", clear_vars)
globalScope.Set("CLEAR_VARS", clearVarsPath)
globalScope.SetFunc("my-dir", mydir)
globalScope.SetFunc("all-java-files-under", allFilesUnder("*.java"))
globalScope.SetFunc("all-proto-files-under", allFilesUnder("*.proto"))

4
androidmk/androidmk/androidmk.go
View File

@@ -156,9 +156,9 @@ func ConvertFile(filename string, buffer *bytes.Buffer) (string, []error) {
continue
}
switch module {
case clear_vars:
case clearVarsPath:
resetModule(file)
case include_ignored:
case includeIgnoredPath:
// subdirs are already automatically included in Soong
continue
default: