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

Merge "Allow more PATH tools, expose HOST_STRIP"

Browse Source 
am: 1d2318d6cd

Change-Id: I59018ba782bff3cad74eaacd6306c77c4953a40c
This commit is contained in:
Dan Willemsen
2018-06-01 17:09:17 -07:00
committed by android-build-merger
parent 7bc0f8dbd6 1d2318d6cd
commit fe3f651a8c
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cc/makevars.go
View File

@@ -312,6 +312,7 @@ func makeVarsToolchain(ctx android.MakeVarsContext, secondPrefix string,
ctx.Strict(makePrefix+"CC", gccCmd(toolchain, "gcc"))
ctx.Strict(makePrefix+"CXX", gccCmd(toolchain, "g++"))
ctx.Strict(makePrefix+"STRIP", gccCmd(toolchain, "strip"))
if target.Os == android.Darwin {
ctx.Strict(makePrefix+"AR", "${config.MacArPath}")
@@ -328,7 +329,6 @@ func makeVarsToolchain(ctx android.MakeVarsContext, secondPrefix string,
if target.Os.Class == android.Device {
ctx.Strict(makePrefix+"OBJCOPY", gccCmd(toolchain, "objcopy"))
ctx.Strict(makePrefix+"LD", gccCmd(toolchain, "ld"))
ctx.Strict(makePrefix+"STRIP", gccCmd(toolchain, "strip"))
ctx.Strict(makePrefix+"GCC_VERSION", toolchain.GccVersion())
ctx.Strict(makePrefix+"NDK_GCC_VERSION", toolchain.GccVersion())
ctx.Strict(makePrefix+"NDK_TRIPLE", config.NDKTriple(toolchain))

3
ui/build/paths/config.go
View File

@@ -83,6 +83,7 @@ var Configuration = map[string]PathConfig{
"head": Allowed,
"hexdump": Allowed,
"hostname": Allowed,
"id": Allowed,
"jar": Allowed,
"java": Allowed,
"javap": Allowed,
@@ -104,11 +105,13 @@ var Configuration = map[string]PathConfig{
"readlink": Allowed,
"realpath": Allowed,
"rm": Allowed,
"rmdir": Allowed,
"rsync": Allowed,
"runalarm": Allowed,
"sed": Allowed,
"setsid": Allowed,
"sh": Allowed,
"sha1sum": Allowed,
"sha256sum": Allowed,
"sha512sum": Allowed,
"sort": Allowed,