diff options
| -rw-r--r-- | android/api_levels.go | 2 | ||||
| -rw-r--r-- | android/variable.go | 2 | ||||
| -rw-r--r-- | apex/apex_singleton.go | 11 | ||||
| -rw-r--r-- | cmd/multiproduct_kati/main.go | 2 | ||||
| -rw-r--r-- | java/aar.go | 12 | ||||
| -rw-r--r-- | rust/benchmark.go | 1 | ||||
| -rw-r--r-- | rust/config/global.go | 1 | ||||
| -rw-r--r-- | rust/test.go | 8 | ||||
| -rw-r--r-- | rust/testing.go | 2 |
9 files changed, 35 insertions, 6 deletions
diff --git a/android/api_levels.go b/android/api_levels.go index 93583bc07..a337371ae 100644 --- a/android/api_levels.go +++ b/android/api_levels.go @@ -290,6 +290,7 @@ func getFinalCodenamesMap(config Config) map[string]int { "Q": 29, "R": 30, "S": 31, + "S-V2": 32, } // TODO: Differentiate "current" and "future". @@ -333,6 +334,7 @@ func getApiLevelsMap(config Config) map[string]int { "Q": 29, "R": 30, "S": 31, + "S-V2": 32, } for i, codename := range config.PlatformVersionActiveCodenames() { apiLevelsMap[codename] = previewAPILevelBase + i diff --git a/android/variable.go b/android/variable.go index 0dc5262c7..741d9aed5 100644 --- a/android/variable.go +++ b/android/variable.go @@ -101,6 +101,8 @@ type variableProperties struct { Keep_symbols *bool Keep_symbols_and_debug_frame *bool } + Srcs []string + Exclude_srcs []string } // eng is true for -eng builds, and can be used to turn on additionaly heavyweight debugging diff --git a/apex/apex_singleton.go b/apex/apex_singleton.go index 98238428e..6faed7011 100644 --- a/apex/apex_singleton.go +++ b/apex/apex_singleton.go @@ -59,8 +59,15 @@ var ( echo "******************************"; echo "Detected changes to allowed dependencies in updatable modules."; echo "To fix and update packages/modules/common/build/allowed_deps.txt, please run:"; - echo "$$ (croot && packages/modules/common/build/update-apex-allowed-deps.sh)"; - echo "Members of mainline-modularization@google.com will review the changes."; + echo -e "$$ (croot && packages/modules/common/build/update-apex-allowed-deps.sh)\n"; + echo "When submitting the generated CL, you must include the following information"; + echo "in the commit message if you are adding a new dependency:"; + echo "Apex-Size-Increase:"; + echo "Previous-Platform-Support:"; + echo "Aosp-First:"; + echo "Test-Info:"; + echo "You do not need OWNERS approval to submit the change, but mainline-modularization@"; + echo "will periodically review additions and may require changes."; echo -e "******************************\n"; exit 1; fi; diff --git a/cmd/multiproduct_kati/main.go b/cmd/multiproduct_kati/main.go index 55a5470e3..c7adbbd63 100644 --- a/cmd/multiproduct_kati/main.go +++ b/cmd/multiproduct_kati/main.go @@ -244,7 +244,7 @@ func main() { jobs = runtime.NumCPU() / 4 ramGb := int(config.TotalRAM() / 1024 / 1024 / 1024) - if ramJobs := ramGb / 25; ramGb > 0 && jobs > ramJobs { + if ramJobs := ramGb / 30; ramGb > 0 && jobs > ramJobs { jobs = ramJobs } diff --git a/java/aar.go b/java/aar.go index 04727e4b9..a5cf0fd70 100644 --- a/java/aar.go +++ b/java/aar.go @@ -486,6 +486,18 @@ type AndroidLibrary struct { exportedStaticPackages android.Paths } +var _ android.OutputFileProducer = (*AndroidLibrary)(nil) + +// For OutputFileProducer interface +func (a *AndroidLibrary) OutputFiles(tag string) (android.Paths, error) { + switch tag { + case ".aar": + return []android.Path{a.aarFile}, nil + default: + return a.Library.OutputFiles(tag) + } +} + func (a *AndroidLibrary) ExportedProguardFlagFiles() android.Paths { return a.exportedProguardFlagFiles } diff --git a/rust/benchmark.go b/rust/benchmark.go index b89f5cd9b..0e842435d 100644 --- a/rust/benchmark.go +++ b/rust/benchmark.go @@ -101,6 +101,7 @@ func (benchmark *benchmarkDecorator) compilerFlags(ctx ModuleContext, flags Flag func (benchmark *benchmarkDecorator) compilerDeps(ctx DepsContext, deps Deps) Deps { deps = benchmark.binaryDecorator.compilerDeps(ctx, deps) + deps.Rustlibs = append(deps.Rustlibs, "libtest") deps.Rustlibs = append(deps.Rustlibs, "libcriterion") return deps diff --git a/rust/config/global.go b/rust/config/global.go index 43b49d18b..1b56237b3 100644 --- a/rust/config/global.go +++ b/rust/config/global.go @@ -29,7 +29,6 @@ var ( DefaultEdition = "2018" Stdlibs = []string{ "libstd", - "libtest", } // Mapping between Soong internal arch types and std::env constants. diff --git a/rust/test.go b/rust/test.go index 6caa7b168..e95b47cff 100644 --- a/rust/test.go +++ b/rust/test.go @@ -169,3 +169,11 @@ func RustTestHostFactory() android.Module { func (test *testDecorator) stdLinkage(ctx *depsContext) RustLinkage { return RlibLinkage } + +func (test *testDecorator) compilerDeps(ctx DepsContext, deps Deps) Deps { + deps = test.binaryDecorator.compilerDeps(ctx, deps) + + deps.Rustlibs = append(deps.Rustlibs, "libtest") + + return deps +} diff --git a/rust/testing.go b/rust/testing.go index a0f86b220..1e0c5abbb 100644 --- a/rust/testing.go +++ b/rust/testing.go @@ -162,12 +162,10 @@ func GatherRequiredDepsForTest() string { name: "libtest", crate_name: "test", srcs: ["foo.rs"], - no_stdlibs: true, host_supported: true, vendor_available: true, vendor_ramdisk_available: true, native_coverage: false, - sysroot: true, apex_available: ["//apex_available:platform", "//apex_available:anyapex"], min_sdk_version: "29", } |