diff options
Diffstat (limited to 'cc/makevars.go')
| -rw-r--r-- | cc/makevars.go | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/cc/makevars.go b/cc/makevars.go index ca97b76f3..9358755cc 100644 --- a/cc/makevars.go +++ b/cc/makevars.go @@ -100,15 +100,7 @@ func makeVarsProvider(ctx android.MakeVarsContext) { // Filter vendor_public_library that are exported to make var exportedVendorPublicLibraries []string - var warningsAllowed []string - var usingWnoErrors []string - var missingProfiles []string ctx.VisitAllModules(func(module android.Module) { - if v, ok := android.OtherModuleProvider(ctx, module, CcMakeVarsInfoProvider); ok { - warningsAllowed = android.AppendIfNotZero(warningsAllowed, v.WarningsAllowed) - usingWnoErrors = android.AppendIfNotZero(usingWnoErrors, v.UsingWnoError) - missingProfiles = android.AppendIfNotZero(missingProfiles, v.MissingProfile) - } if ccModule, ok := module.(*Module); ok { baseName := ccModule.BaseModuleName() if ccModule.IsVendorPublicLibrary() && module.ExportedToMake() { @@ -123,9 +115,6 @@ func makeVarsProvider(ctx android.MakeVarsContext) { ctx.Strict("LSDUMP_PATHS", strings.Join(lsdumpPaths, " ")) ctx.Strict("ANDROID_WARNING_ALLOWED_PROJECTS", makeStringOfWarningAllowedProjects()) - ctx.Strict("SOONG_MODULES_WARNINGS_ALLOWED", makeVarsString(warningsAllowed)) - ctx.Strict("SOONG_MODULES_USING_WNO_ERROR", makeVarsString(usingWnoErrors)) - ctx.Strict("SOONG_MODULES_MISSING_PGO_PROFILE_FILE", makeVarsString(missingProfiles)) ctx.Strict("CLANG_COVERAGE_CONFIG_CFLAGS", strings.Join(clangCoverageCFlags, " ")) ctx.Strict("CLANG_COVERAGE_CONFIG_COMMFLAGS", strings.Join(clangCoverageCommonFlags, " ")) @@ -175,16 +164,18 @@ func makeVarsProvider(ctx android.MakeVarsContext) { sort.Strings(ndkKnownLibs) ctx.Strict("NDK_KNOWN_LIBS", strings.Join(ndkKnownLibs, " ")) - hostTargets := ctx.Config().Targets[ctx.Config().BuildOS] - makeVarsToolchain(ctx, "", hostTargets[0]) - if len(hostTargets) > 1 { - makeVarsToolchain(ctx, "2ND_", hostTargets[1]) + if hostTargets := ctx.Config().Targets[ctx.Config().BuildOS]; len(hostTargets) > 0 { + makeVarsToolchain(ctx, "", hostTargets[0]) + if len(hostTargets) > 1 { + makeVarsToolchain(ctx, "2ND_", hostTargets[1]) + } } - deviceTargets := ctx.Config().Targets[android.Android] - makeVarsToolchain(ctx, "", deviceTargets[0]) - if len(deviceTargets) > 1 { - makeVarsToolchain(ctx, "2ND_", deviceTargets[1]) + if deviceTargets := ctx.Config().Targets[android.Android]; len(deviceTargets) > 0 { + makeVarsToolchain(ctx, "", deviceTargets[0]) + if len(deviceTargets) > 1 { + makeVarsToolchain(ctx, "2ND_", deviceTargets[1]) + } } } |