diff options
Diffstat (limited to 'cc/makevars.go')
| -rw-r--r-- | cc/makevars.go | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/cc/makevars.go b/cc/makevars.go index da5f1fde2..6b65c7645 100644 --- a/cc/makevars.go +++ b/cc/makevars.go @@ -17,6 +17,7 @@ package cc import ( "fmt" "sort" + "strconv" "strings" "sync" @@ -71,6 +72,8 @@ func (c *notOnHostContext) Host() bool { } func makeVarsProvider(ctx android.MakeVarsContext) { + sdclangMakeVars(ctx) + ctx.Strict("LLVM_RELEASE_VERSION", "${config.ClangShortVersion}") ctx.Strict("LLVM_PREBUILTS_VERSION", "${config.ClangVersion}") ctx.Strict("LLVM_PREBUILTS_BASE", "${config.ClangBase}") @@ -98,6 +101,7 @@ func makeVarsProvider(ctx android.MakeVarsContext) { ctx.Strict("BOARD_VNDK_VERSION", ctx.DeviceConfig().VndkVersion()) ctx.Strict("RECOVERY_SNAPSHOT_VERSION", ctx.DeviceConfig().RecoverySnapshotVersion()) + ctx.Strict("RAMDISK_SNAPSHOT_VERSION", ctx.DeviceConfig().RamdiskSnapshotVersion()) // Filter vendor_public_library that are exported to make exportedVendorPublicLibraries := []string{} @@ -178,6 +182,17 @@ func makeVarsProvider(ctx android.MakeVarsContext) { } } +func sdclangMakeVars(ctx android.MakeVarsContext) { + if config.ForceSDClangOff { + ctx.Strict("FORCE_SDCLANG_OFF", strconv.FormatBool(config.ForceSDClangOff)) + } + if config.SDClang { + ctx.Strict("SDCLANG", strconv.FormatBool(config.SDClang)) + } + ctx.Strict("SDCLANG_PATH", "${config.SDClangBin}") + ctx.Strict("SDCLANG_COMMON_FLAGS", "${config.SDClangFlags}") +} + func makeVarsToolchain(ctx android.MakeVarsContext, secondPrefix string, target android.Target) { var typePrefix string @@ -278,10 +293,17 @@ func makeVarsToolchain(ctx android.MakeVarsContext, secondPrefix string, ctx.Strict(makePrefix+"OTOOL", "${config.MacToolPath}/otool") ctx.Strict(makePrefix+"STRIP", "${config.MacStripPath}") } else { - ctx.Strict(makePrefix+"AR", "${config.ClangBin}/llvm-ar") - ctx.Strict(makePrefix+"READELF", "${config.ClangBin}/llvm-readelf") - ctx.Strict(makePrefix+"NM", "${config.ClangBin}/llvm-nm") - ctx.Strict(makePrefix+"STRIP", "${config.ClangBin}/llvm-strip") + if config.SDClang { + ctx.Strict(makePrefix+"AR", "${config.SDClangBin}/llvm-ar") + ctx.Strict(makePrefix+"READELF", "${config.SDClangBin}/llvm-readelf") + ctx.Strict(makePrefix+"NM", "${config.SDClangBin}/llvm-nm") + ctx.Strict(makePrefix+"STRIP", "${config.SDClangBin}/llvm-strip") + } else { + ctx.Strict(makePrefix+"AR", "${config.ClangBin}/llvm-ar") + ctx.Strict(makePrefix+"READELF", "${config.ClangBin}/llvm-readelf") + ctx.Strict(makePrefix+"NM", "${config.ClangBin}/llvm-nm") + ctx.Strict(makePrefix+"STRIP", "${config.ClangBin}/llvm-strip") + } } if target.Os.Class == android.Device { |