Merge "Add python3 embedded launcher support"
diff --git a/android/module.go b/android/module.go
index 70b602b..a6b8d53 100644
--- a/android/module.go
+++ b/android/module.go
@@ -1195,9 +1195,9 @@
func (m *moduleContext) Rule(pctx PackageContext, name string, params blueprint.RuleParams,
argNames ...string) blueprint.Rule {
- if m.config.UseGoma() && params.Pool == nil {
- // When USE_GOMA=true is set and the rule is not supported by goma, restrict jobs to the
- // local parallelism value
+ if (m.config.UseGoma() || m.config.UseRBE()) && params.Pool == nil {
+ // When USE_GOMA=true or USE_RBE=true are set and the rule is not supported by goma/RBE, restrict
+ // jobs to the local parallelism value
params.Pool = localPool
}
diff --git a/android/package_ctx.go b/android/package_ctx.go
index 548450e..cf8face 100644
--- a/android/package_ctx.go
+++ b/android/package_ctx.go
@@ -115,9 +115,9 @@
if len(ctx.errors) > 0 {
return params, ctx.errors[0]
}
- if ctx.Config().UseGoma() && params.Pool == nil {
- // When USE_GOMA=true is set and the rule is not supported by goma, restrict jobs to the
- // local parallelism value
+ if (ctx.Config().UseGoma() || ctx.Config().UseRBE()) && params.Pool == nil {
+ // When USE_GOMA=true or USE_RBE=true are set and the rule is not supported by
+ // goma/RBE, restrict jobs to the local parallelism value
params.Pool = localPool
}
return params, nil
@@ -254,9 +254,35 @@
}, argNames...)
}
-// AndroidGomaStaticRule wraps blueprint.StaticRule but uses goma's parallelism if goma is enabled
-func (p PackageContext) AndroidGomaStaticRule(name string, params blueprint.RuleParams,
+// RemoteRuleSupports selects if a AndroidRemoteStaticRule supports goma, RBE, or both.
+type RemoteRuleSupports int
+
+const (
+ SUPPORTS_NONE = 0
+ SUPPORTS_GOMA = 1 << iota
+ SUPPORTS_RBE = 1 << iota
+ SUPPORTS_BOTH = SUPPORTS_GOMA | SUPPORTS_RBE
+)
+
+// AndroidRemoteStaticRule wraps blueprint.StaticRule but uses goma or RBE's parallelism if goma or RBE are enabled
+// and the appropriate SUPPORTS_* flag is set.
+func (p PackageContext) AndroidRemoteStaticRule(name string, supports RemoteRuleSupports, params blueprint.RuleParams,
argNames ...string) blueprint.Rule {
- // bypass android.PackageContext.StaticRule so that Pool does not get set to local_pool.
- return p.PackageContext.StaticRule(name, params, argNames...)
+
+ return p.PackageContext.RuleFunc(name, func(config interface{}) (blueprint.RuleParams, error) {
+ ctx := &configErrorWrapper{p, config.(Config), nil}
+ if ctx.Config().UseGoma() && supports&SUPPORTS_GOMA == 0 {
+ // When USE_GOMA=true is set and the rule is not supported by goma, restrict jobs to the
+ // local parallelism value
+ params.Pool = localPool
+ }
+
+ if ctx.Config().UseRBE() && supports&SUPPORTS_RBE == 0 {
+ // When USE_RBE=true is set and the rule is not supported by RBE, restrict jobs to the
+ // local parallelism value
+ params.Pool = localPool
+ }
+
+ return params, nil
+ }, argNames...)
}
diff --git a/android/singleton.go b/android/singleton.go
index 33bc6d1..5519ca0 100644
--- a/android/singleton.go
+++ b/android/singleton.go
@@ -131,9 +131,9 @@
}
func (s *singletonContextAdaptor) Rule(pctx PackageContext, name string, params blueprint.RuleParams, argNames ...string) blueprint.Rule {
- if s.Config().UseGoma() && params.Pool == nil {
- // When USE_GOMA=true is set and the rule is not supported by goma, restrict jobs to the
- // local parallelism value
+ if (s.Config().UseGoma() || s.Config().UseRBE()) && params.Pool == nil {
+ // When USE_GOMA=true or USE_RBE=true are set and the rule is not supported by goma/RBE, restrict
+ // jobs to the local parallelism value
params.Pool = localPool
}
rule := s.SingletonContext.Rule(pctx.PackageContext, name, params, argNames...)
diff --git a/bpf/bpf.go b/bpf/bpf.go
index 90ec963..024fcbc 100644
--- a/bpf/bpf.go
+++ b/bpf/bpf.go
@@ -33,7 +33,7 @@
var (
pctx = android.NewPackageContext("android/soong/bpf")
- ccRule = pctx.AndroidGomaStaticRule("ccRule",
+ ccRule = pctx.AndroidRemoteStaticRule("ccRule", android.SUPPORTS_GOMA,
blueprint.RuleParams{
Depfile: "${out}.d",
Deps: blueprint.DepsGCC,
diff --git a/bpfix/bpfix/bpfix.go b/bpfix/bpfix/bpfix.go
index 9cba80a..4633aa6 100644
--- a/bpfix/bpfix/bpfix.go
+++ b/bpfix/bpfix/bpfix.go
@@ -116,6 +116,10 @@
Name: "rewriteAndroidAppImport",
Fix: rewriteAndroidAppImport,
},
+ {
+ Name: "removeEmptyLibDependencies",
+ Fix: removeEmptyLibDependencies,
+ },
}
func NewFixRequest() FixRequest {
@@ -650,6 +654,50 @@
return nil
}
+// Removes library dependencies which are empty (and restricted from usage in Soong)
+func removeEmptyLibDependencies(f *Fixer) error {
+ emptyLibraries := []string{
+ "libhidltransport",
+ "libhwbinder",
+ }
+ relevantFields := []string{
+ "export_shared_lib_headers",
+ "export_static_lib_headers",
+ "static_libs",
+ "whole_static_libs",
+ "shared_libs",
+ }
+ for _, def := range f.tree.Defs {
+ mod, ok := def.(*parser.Module)
+ if !ok {
+ continue
+ }
+ for _, field := range relevantFields {
+ listValue, ok := getLiteralListProperty(mod, field)
+ if !ok {
+ continue
+ }
+ newValues := []parser.Expression{}
+ for _, v := range listValue.Values {
+ stringValue, ok := v.(*parser.String)
+ if !ok {
+ return fmt.Errorf("Expecting string for %s.%s fields", mod.Type, field)
+ }
+ if inList(stringValue.Value, emptyLibraries) {
+ continue
+ }
+ newValues = append(newValues, stringValue)
+ }
+ if len(newValues) == 0 && len(listValue.Values) != 0 {
+ removeProperty(mod, field)
+ } else {
+ listValue.Values = newValues
+ }
+ }
+ }
+ return nil
+}
+
// Converts the default source list property, 'srcs', to a single source property with a given name.
// "LOCAL_MODULE" reference is also resolved during the conversion process.
func convertToSingleSource(mod *parser.Module, srcPropertyName string) {
@@ -1084,3 +1132,12 @@
}
mod.Properties = newList
}
+
+func inList(s string, list []string) bool {
+ for _, v := range list {
+ if s == v {
+ return true
+ }
+ }
+ return false
+}
diff --git a/bpfix/bpfix/bpfix_test.go b/bpfix/bpfix/bpfix_test.go
index 5e0b817..032282f 100644
--- a/bpfix/bpfix/bpfix_test.go
+++ b/bpfix/bpfix/bpfix_test.go
@@ -833,3 +833,57 @@
})
}
}
+
+func TestRemoveEmptyLibDependencies(t *testing.T) {
+ tests := []struct {
+ name string
+ in string
+ out string
+ }{
+ {
+ name: "remove sole shared lib",
+ in: `
+ cc_library {
+ name: "foo",
+ shared_libs: ["libhwbinder"],
+ }
+ `,
+ out: `
+ cc_library {
+ name: "foo",
+
+ }
+ `,
+ },
+ {
+ name: "remove a shared lib",
+ in: `
+ cc_library {
+ name: "foo",
+ shared_libs: [
+ "libhwbinder",
+ "libfoo",
+ "libhidltransport",
+ ],
+ }
+ `,
+ out: `
+ cc_library {
+ name: "foo",
+ shared_libs: [
+
+ "libfoo",
+
+ ],
+ }
+ `,
+ },
+ }
+ for _, test := range tests {
+ t.Run(test.name, func(t *testing.T) {
+ runPass(t, test.in, test.out, func(fixer *Fixer) error {
+ return removeEmptyLibDependencies(fixer)
+ })
+ })
+ }
+}
diff --git a/cc/builder.go b/cc/builder.go
index 491ebc5..068c930 100644
--- a/cc/builder.go
+++ b/cc/builder.go
@@ -46,7 +46,7 @@
var (
pctx = android.NewPackageContext("android/soong/cc")
- cc = pctx.AndroidGomaStaticRule("cc",
+ cc = pctx.AndroidRemoteStaticRule("cc", android.SUPPORTS_BOTH,
blueprint.RuleParams{
Depfile: "${out}.d",
Deps: blueprint.DepsGCC,
@@ -55,7 +55,7 @@
},
"ccCmd", "cFlags")
- ccNoDeps = pctx.AndroidGomaStaticRule("ccNoDeps",
+ ccNoDeps = pctx.AndroidRemoteStaticRule("ccNoDeps", android.SUPPORTS_GOMA,
blueprint.RuleParams{
Command: "$relPwd ${config.CcWrapper}$ccCmd -c $cFlags -o $out $in",
CommandDeps: []string{"$ccCmd"},
diff --git a/cc/cc_test.go b/cc/cc_test.go
index 808968c..dcf117c 100644
--- a/cc/cc_test.go
+++ b/cc/cc_test.go
@@ -251,12 +251,12 @@
func checkVndkSnapshot(t *testing.T, ctx *android.TestContext, name, subDir, variant string) {
vndkSnapshot := ctx.SingletonForTests("vndk-snapshot")
- snapshotPath := filepath.Join(subDir, name+".so")
mod := ctx.ModuleForTests(name, variant).Module().(*Module)
if !mod.outputFile.Valid() {
t.Errorf("%q must have output\n", name)
return
}
+ snapshotPath := filepath.Join(subDir, mod.outputFile.Path().Base())
out := vndkSnapshot.Output(snapshotPath)
if out.Input != mod.outputFile.Path() {
diff --git a/cc/cmakelists.go b/cc/cmakelists.go
index 7b4f89b..be18ab9 100644
--- a/cc/cmakelists.go
+++ b/cc/cmakelists.go
@@ -306,6 +306,20 @@
return flag
}
+// Flattens a list of strings potentially containing space characters into a list of string containing no
+// spaces.
+func normalizeParameters(params []string) []string {
+ var flatParams []string
+ for _, s := range params {
+ s = strings.Trim(s, " ")
+ if len(s) == 0 {
+ continue
+ }
+ flatParams = append(flatParams, strings.Split(s, " ")...)
+ }
+ return flatParams
+}
+
func parseCompilerParameters(params []string, ctx android.SingletonContext, f *os.File) compilerParameters {
var compilerParameters = makeCompilerParameters()
@@ -313,6 +327,15 @@
f.WriteString(fmt.Sprintf("# Raw param [%d] = '%s'\n", i, str))
}
+ // Soong does not guarantee that each flag will be in an individual string. e.g: The
+ // input received could be:
+ // params = {"-isystem", "path/to/system"}
+ // or it could be
+ // params = {"-isystem path/to/system"}
+ // To normalize the input, we split all strings with the "space" character and consolidate
+ // all tokens into a flattened parameters list
+ params = normalizeParameters(params)
+
for i := 0; i < len(params); i++ {
param := params[i]
if param == "" {
diff --git a/cc/vndk.go b/cc/vndk.go
index d6c2f6f..bb4aafc 100644
--- a/cc/vndk.go
+++ b/cc/vndk.go
@@ -19,6 +19,7 @@
"errors"
"fmt"
"path/filepath"
+ "sort"
"strings"
"sync"
@@ -199,8 +200,6 @@
llndkLibrariesKey = android.NewOnceKey("llndkLibrarires")
vndkPrivateLibrariesKey = android.NewOnceKey("vndkPrivateLibrarires")
vndkUsingCoreVariantLibrariesKey = android.NewOnceKey("vndkUsingCoreVariantLibrarires")
- modulePathsKey = android.NewOnceKey("modulePaths")
- vndkSnapshotOutputsKey = android.NewOnceKey("vndkSnapshotOutputs")
vndkMustUseVendorVariantListKey = android.NewOnceKey("vndkMustUseVendorVariantListKey")
vndkLibrariesLock sync.Mutex
@@ -247,18 +246,6 @@
}).(map[string]string)
}
-func modulePaths(config android.Config) map[string]string {
- return config.Once(modulePathsKey, func() interface{} {
- return make(map[string]string)
- }).(map[string]string)
-}
-
-func vndkSnapshotOutputs(config android.Config) *android.RuleBuilderInstalls {
- return config.Once(vndkSnapshotOutputsKey, func() interface{} {
- return &android.RuleBuilderInstalls{}
- }).(*android.RuleBuilderInstalls)
-}
-
func vndkMustUseVendorVariantList(cfg android.Config) []string {
return cfg.Once(vndkMustUseVendorVariantListKey, func() interface{} {
return config.VndkMustUseVendorVariantList
@@ -297,8 +284,6 @@
vndkLibrariesLock.Lock()
defer vndkLibrariesLock.Unlock()
- modulePaths(mctx.Config())[name] = mctx.ModuleDir()
-
if inList(name, vndkMustUseVendorVariantList(mctx.Config())) {
m.Properties.MustUseVendorVariant = true
}
@@ -376,10 +361,6 @@
func init() {
android.RegisterSingletonType("vndk-snapshot", VndkSnapshotSingleton)
- android.RegisterMakeVarsProvider(pctx, func(ctx android.MakeVarsContext) {
- outputs := vndkSnapshotOutputs(ctx.Config())
- ctx.Strict("SOONG_VNDK_SNAPSHOT_FILES", outputs.String())
- })
}
func VndkSnapshotSingleton() android.Singleton {
@@ -388,12 +369,13 @@
type vndkSnapshotSingleton struct {
installedLlndkLibraries []string
- llnkdLibrariesFile android.Path
+ llndkLibrariesFile android.Path
vndkSpLibrariesFile android.Path
vndkCoreLibrariesFile android.Path
vndkPrivateLibrariesFile android.Path
vndkCoreVariantLibrariesFile android.Path
vndkLibrariesFile android.Path
+ vndkSnapshotZipFile android.OptionalPath
}
func (c *vndkSnapshotSingleton) GenerateBuildActions(ctx android.SingletonContext) {
@@ -413,15 +395,42 @@
return
}
- outputs := vndkSnapshotOutputs(ctx.Config())
+ var snapshotOutputs android.Paths
+
+ /*
+ VNDK snapshot zipped artifacts directory structure:
+ {SNAPSHOT_ARCH}/
+ arch-{TARGET_ARCH}-{TARGET_ARCH_VARIANT}/
+ shared/
+ vndk-core/
+ (VNDK-core libraries, e.g. libbinder.so)
+ vndk-sp/
+ (VNDK-SP libraries, e.g. libc++.so)
+ arch-{TARGET_2ND_ARCH}-{TARGET_2ND_ARCH_VARIANT}/
+ shared/
+ vndk-core/
+ (VNDK-core libraries, e.g. libbinder.so)
+ vndk-sp/
+ (VNDK-SP libraries, e.g. libc++.so)
+ binder32/
+ (This directory is newly introduced in v28 (Android P) to hold
+ prebuilts built for 32-bit binder interface.)
+ arch-{TARGET_ARCH}-{TARGE_ARCH_VARIANT}/
+ ...
+ configs/
+ (various *.txt configuration files)
+ include/
+ (header files of same directory structure with source tree)
+ NOTICE_FILES/
+ (notice files of libraries, e.g. libcutils.so.txt)
+ */
snapshotDir := "vndk-snapshot"
+ snapshotArchDir := filepath.Join(snapshotDir, ctx.DeviceConfig().DeviceArch())
- vndkLibDir := make(map[android.ArchType]string)
-
- snapshotVariantDir := ctx.DeviceConfig().DeviceArch()
+ targetArchDirMap := make(map[android.ArchType]string)
for _, target := range ctx.Config().Targets[android.Android] {
- dir := snapshotVariantDir
+ dir := snapshotArchDir
if ctx.DeviceConfig().BinderBitness() == "32" {
dir = filepath.Join(dir, "binder32")
}
@@ -430,64 +439,55 @@
arch += "-" + target.Arch.ArchVariant
}
dir = filepath.Join(dir, arch)
- vndkLibDir[target.Arch.ArchType] = dir
+ targetArchDirMap[target.Arch.ArchType] = dir
}
- configsDir := filepath.Join(snapshotVariantDir, "configs")
- noticeDir := filepath.Join(snapshotVariantDir, "NOTICE_FILES")
- includeDir := filepath.Join(snapshotVariantDir, "include")
+ configsDir := filepath.Join(snapshotArchDir, "configs")
+ noticeDir := filepath.Join(snapshotArchDir, "NOTICE_FILES")
+ includeDir := filepath.Join(snapshotArchDir, "include")
+
+ // set of include paths exported by VNDK libraries
+ exportedIncludes := make(map[string]bool)
+
+ // generated header files among exported headers.
+ var generatedHeaders android.Paths
+
+ // set of notice files copied.
noticeBuilt := make(map[string]bool)
- installSnapshotFileFromPath := func(path android.Path, out string) {
+ // paths of VNDK modules for GPL license checking
+ modulePaths := make(map[string]string)
+
+ // actual module names of .so files
+ // e.g. moduleNames["libprotobuf-cpp-full-3.9.1.so"] = "libprotobuf-cpp-full"
+ moduleNames := make(map[string]string)
+
+ installSnapshotFileFromPath := func(path android.Path, out string) android.OutputPath {
+ outPath := android.PathForOutput(ctx, out)
ctx.Build(pctx, android.BuildParams{
Rule: android.Cp,
Input: path,
- Output: android.PathForOutput(ctx, snapshotDir, out),
+ Output: outPath,
Description: "vndk snapshot " + out,
Args: map[string]string{
"cpFlags": "-f -L",
},
})
- *outputs = append(*outputs, android.RuleBuilderInstall{
- From: android.PathForOutput(ctx, snapshotDir, out),
- To: out,
- })
+ return outPath
}
- installSnapshotFileFromContent := func(content, out string) {
+
+ installSnapshotFileFromContent := func(content, out string) android.OutputPath {
+ outPath := android.PathForOutput(ctx, out)
ctx.Build(pctx, android.BuildParams{
Rule: android.WriteFile,
- Output: android.PathForOutput(ctx, snapshotDir, out),
+ Output: outPath,
Description: "vndk snapshot " + out,
Args: map[string]string{
"content": content,
},
})
- *outputs = append(*outputs, android.RuleBuilderInstall{
- From: android.PathForOutput(ctx, snapshotDir, out),
- To: out,
- })
+ return outPath
}
- tryBuildNotice := func(m *Module) {
- name := ctx.ModuleName(m) + ".so.txt"
-
- if _, ok := noticeBuilt[name]; ok {
- return
- }
-
- noticeBuilt[name] = true
-
- if m.NoticeFile().Valid() {
- installSnapshotFileFromPath(m.NoticeFile().Path(), filepath.Join(noticeDir, name))
- }
- }
-
- vndkCoreLibraries := android.SortedStringKeys(vndkCoreLibraries(ctx.Config()))
- vndkSpLibraries := android.SortedStringKeys(vndkSpLibraries(ctx.Config()))
- vndkPrivateLibraries := android.SortedStringKeys(vndkPrivateLibraries(ctx.Config()))
-
- var generatedHeaders android.Paths
- includeDirs := make(map[string]bool)
-
type vndkSnapshotLibraryInterface interface {
exportedFlagsProducer
libraryInterface
@@ -496,12 +496,31 @@
var _ vndkSnapshotLibraryInterface = (*prebuiltLibraryLinker)(nil)
var _ vndkSnapshotLibraryInterface = (*libraryDecorator)(nil)
- installVndkSnapshotLib := func(m *Module, l vndkSnapshotLibraryInterface, dir string) bool {
- name := ctx.ModuleName(m)
- libOut := filepath.Join(dir, name+".so")
+ installVndkSnapshotLib := func(m *Module, l vndkSnapshotLibraryInterface, vndkType string) (android.Paths, bool) {
+ targetArchDir, ok := targetArchDirMap[m.Target().Arch.ArchType]
+ if !ok {
+ return nil, false
+ }
- installSnapshotFileFromPath(m.outputFile.Path(), libOut)
- tryBuildNotice(m)
+ var ret android.Paths
+
+ libPath := m.outputFile.Path()
+ stem := libPath.Base()
+ snapshotLibOut := filepath.Join(targetArchDir, "shared", vndkType, stem)
+ ret = append(ret, installSnapshotFileFromPath(libPath, snapshotLibOut))
+
+ moduleNames[stem] = ctx.ModuleName(m)
+ modulePaths[stem] = ctx.ModuleDir(m)
+
+ if m.NoticeFile().Valid() {
+ noticeName := stem + ".txt"
+ // skip already copied notice file
+ if _, ok := noticeBuilt[noticeName]; !ok {
+ noticeBuilt[noticeName] = true
+ ret = append(ret, installSnapshotFileFromPath(
+ m.NoticeFile().Path(), filepath.Join(noticeDir, noticeName)))
+ }
+ }
if ctx.Config().VndkSnapshotBuildArtifacts() {
prop := struct {
@@ -515,20 +534,19 @@
prop.ExportedSystemDirs = l.exportedSystemDirs().Strings()
prop.RelativeInstallPath = m.RelativeInstallPath()
- propOut := libOut + ".json"
+ propOut := snapshotLibOut + ".json"
j, err := json.Marshal(prop)
if err != nil {
ctx.Errorf("json marshal to %q failed: %#v", propOut, err)
- return false
+ return nil, false
}
-
- installSnapshotFileFromContent(string(j), propOut)
+ ret = append(ret, installSnapshotFileFromContent(string(j), propOut))
}
- return true
+ return ret, true
}
- isVndkSnapshotLibrary := func(m *Module) (i vndkSnapshotLibraryInterface, libDir string, isVndkSnapshotLib bool) {
+ isVndkSnapshotLibrary := func(m *Module) (i vndkSnapshotLibraryInterface, vndkType string, isVndkSnapshotLib bool) {
if m.Target().NativeBridge == android.NativeBridgeEnabled {
return nil, "", false
}
@@ -539,14 +557,15 @@
if !ok || !l.shared() {
return nil, "", false
}
- name := ctx.ModuleName(m)
- if inList(name, vndkCoreLibraries) {
- return l, filepath.Join("shared", "vndk-core"), true
- } else if inList(name, vndkSpLibraries) {
- return l, filepath.Join("shared", "vndk-sp"), true
- } else {
- return nil, "", false
+ if m.vndkVersion() == ctx.DeviceConfig().PlatformVndkVersion() && m.IsVndk() && !m.isVndkExt() {
+ if m.isVndkSp() {
+ return l, "vndk-sp", true
+ } else {
+ return l, "vndk-core", true
+ }
}
+
+ return nil, "", false
}
ctx.VisitAllModules(func(module android.Module) {
@@ -555,31 +574,32 @@
return
}
- baseDir, ok := vndkLibDir[m.Target().Arch.ArchType]
+ l, vndkType, ok := isVndkSnapshotLibrary(m)
if !ok {
return
}
- l, libDir, ok := isVndkSnapshotLibrary(m)
+ libs, ok := installVndkSnapshotLib(m, l, vndkType)
if !ok {
return
}
- if !installVndkSnapshotLib(m, l, filepath.Join(baseDir, libDir)) {
- return
- }
+ snapshotOutputs = append(snapshotOutputs, libs...)
+ // We glob headers from include directories inside source tree. So we first gather
+ // all include directories inside our source tree. On the contrast, we manually
+ // collect generated headers from dependencies as they can't globbed.
generatedHeaders = append(generatedHeaders, l.exportedDeps()...)
for _, dir := range append(l.exportedDirs(), l.exportedSystemDirs()...) {
- includeDirs[dir.String()] = true
+ exportedIncludes[dir.String()] = true
}
})
if ctx.Config().VndkSnapshotBuildArtifacts() {
- headers := make(map[string]bool)
+ globbedHeaders := make(map[string]bool)
- for _, dir := range android.SortedStringKeys(includeDirs) {
- // workaround to determine if dir is under output directory
+ for _, dir := range android.SortedStringKeys(exportedIncludes) {
+ // Skip if dir is for generated headers
if strings.HasPrefix(dir, android.PathForOutput(ctx).String()) {
continue
}
@@ -598,14 +618,14 @@
if strings.HasSuffix(header, "/") {
continue
}
- headers[header] = true
+ globbedHeaders[header] = true
}
}
}
- for _, header := range android.SortedStringKeys(headers) {
- installSnapshotFileFromPath(android.PathForSource(ctx, header),
- filepath.Join(includeDir, header))
+ for _, header := range android.SortedStringKeys(globbedHeaders) {
+ snapshotOutputs = append(snapshotOutputs, installSnapshotFileFromPath(
+ android.PathForSource(ctx, header), filepath.Join(includeDir, header)))
}
isHeader := func(path string) bool {
@@ -617,6 +637,7 @@
return false
}
+ // For generated headers, manually install one by one, rather than glob
for _, path := range android.PathsToDirectorySortedPaths(android.FirstUniquePaths(generatedHeaders)) {
header := path.String()
@@ -624,33 +645,85 @@
continue
}
- installSnapshotFileFromPath(path, filepath.Join(includeDir, header))
+ snapshotOutputs = append(snapshotOutputs, installSnapshotFileFromPath(
+ path, filepath.Join(includeDir, header)))
}
}
- installSnapshotFileFromContent(android.JoinWithSuffix(vndkCoreLibraries, ".so", "\\n"),
- filepath.Join(configsDir, "vndkcore.libraries.txt"))
- installSnapshotFileFromContent(android.JoinWithSuffix(vndkPrivateLibraries, ".so", "\\n"),
- filepath.Join(configsDir, "vndkprivate.libraries.txt"))
+ snapshotOutputs = append(snapshotOutputs,
+ installSnapshotFileFromPath(c.vndkCoreLibrariesFile, filepath.Join(configsDir, "vndkcore.libraries.txt")),
+ installSnapshotFileFromPath(c.vndkPrivateLibrariesFile, filepath.Join(configsDir, "vndkprivate.libraries.txt")),
+ installSnapshotFileFromPath(c.vndkSpLibrariesFile, filepath.Join(configsDir, "vndksp.libraries.txt")),
+ installSnapshotFileFromPath(c.llndkLibrariesFile, filepath.Join(configsDir, "llndk.libraries.txt")),
+ )
- var modulePathTxtBuilder strings.Builder
+ /*
+ Dump a map to a list file as:
- modulePaths := modulePaths(ctx.Config())
-
- first := true
- for _, lib := range android.SortedStringKeys(modulePaths) {
- if first {
- first = false
- } else {
- modulePathTxtBuilder.WriteString("\\n")
+ {key1} {value1}
+ {key2} {value2}
+ ...
+ */
+ installMapListFile := func(m map[string]string, path string) android.OutputPath {
+ var txtBuilder strings.Builder
+ for idx, k := range android.SortedStringKeys(m) {
+ if idx > 0 {
+ txtBuilder.WriteString("\\n")
+ }
+ txtBuilder.WriteString(k)
+ txtBuilder.WriteString(" ")
+ txtBuilder.WriteString(m[k])
}
- modulePathTxtBuilder.WriteString(lib)
- modulePathTxtBuilder.WriteString(".so ")
- modulePathTxtBuilder.WriteString(modulePaths[lib])
+ return installSnapshotFileFromContent(txtBuilder.String(), path)
}
- installSnapshotFileFromContent(modulePathTxtBuilder.String(),
- filepath.Join(configsDir, "module_paths.txt"))
+ /*
+ module_paths.txt contains paths on which VNDK modules are defined.
+ e.g.,
+ libbase.so system/core/base
+ libc.so bionic/libc
+ ...
+ */
+ snapshotOutputs = append(snapshotOutputs, installMapListFile(modulePaths, filepath.Join(configsDir, "module_paths.txt")))
+
+ /*
+ module_names.txt contains names as which VNDK modules are defined,
+ because output filename and module name can be different with stem and suffix properties.
+
+ e.g.,
+ libcutils.so libcutils
+ libprotobuf-cpp-full-3.9.2.so libprotobuf-cpp-full
+ ...
+ */
+ snapshotOutputs = append(snapshotOutputs, installMapListFile(moduleNames, filepath.Join(configsDir, "module_names.txt")))
+
+ // All artifacts are ready. Sort them to normalize ninja and then zip.
+ sort.Slice(snapshotOutputs, func(i, j int) bool {
+ return snapshotOutputs[i].String() < snapshotOutputs[j].String()
+ })
+
+ zipPath := android.PathForOutput(ctx, snapshotDir, "android-vndk-"+ctx.DeviceConfig().DeviceArch()+".zip")
+ zipRule := android.NewRuleBuilder()
+
+ // If output files are too many, soong_zip command can exceed ARG_MAX.
+ // So first dump file lists into a single list file, and then feed it to Soong
+ snapshotOutputList := android.PathForOutput(ctx, snapshotDir, "android-vndk-"+ctx.DeviceConfig().DeviceArch()+"_list")
+ zipRule.Command().
+ Text("( xargs").
+ FlagWithRspFileInputList("-n1 echo < ", snapshotOutputs).
+ FlagWithOutput("| tr -d \\' > ", snapshotOutputList).
+ Text(")")
+
+ zipRule.Temporary(snapshotOutputList)
+
+ zipRule.Command().
+ BuiltTool(ctx, "soong_zip").
+ FlagWithOutput("-o ", zipPath).
+ FlagWithArg("-C ", android.PathForOutput(ctx, snapshotDir).String()).
+ FlagWithInput("-l ", snapshotOutputList)
+
+ zipRule.Build(pctx, ctx, zipPath.String(), "vndk snapshot "+zipPath.String())
+ c.vndkSnapshotZipFile = android.OptionalPathForPath(zipPath)
}
func getVndkFileName(m *Module) (string, error) {
@@ -697,7 +770,7 @@
vndkprivate := android.SortedStringMapValues(vndkPrivateLibraries(ctx.Config()))
vndkcorevariant := android.SortedStringMapValues(vndkUsingCoreVariantLibraries(ctx.Config()))
- c.llnkdLibrariesFile = installListFile(llndk, "llndk.libraries.txt")
+ c.llndkLibrariesFile = installListFile(llndk, "llndk.libraries.txt")
c.vndkCoreLibrariesFile = installListFile(vndkcore, "vndkcore.libraries.txt")
c.vndkSpLibrariesFile = installListFile(vndksp, "vndksp.libraries.txt")
c.vndkPrivateLibrariesFile = installListFile(vndkprivate, "vndkprivate.libraries.txt")
@@ -739,11 +812,12 @@
ctx.Strict("VNDK_PRIVATE_LIBRARIES", strings.Join(android.SortedStringKeys(vndkPrivateLibraries(ctx.Config())), " "))
ctx.Strict("VNDK_USING_CORE_VARIANT_LIBRARIES", strings.Join(android.SortedStringKeys(vndkUsingCoreVariantLibraries(ctx.Config())), " "))
- ctx.Strict("LLNDK_LIBRARIES_FILE", c.llnkdLibrariesFile.String())
+ ctx.Strict("LLNDK_LIBRARIES_FILE", c.llndkLibrariesFile.String())
ctx.Strict("VNDKCORE_LIBRARIES_FILE", c.vndkCoreLibrariesFile.String())
ctx.Strict("VNDKSP_LIBRARIES_FILE", c.vndkSpLibrariesFile.String())
ctx.Strict("VNDKPRIVATE_LIBRARIES_FILE", c.vndkPrivateLibrariesFile.String())
ctx.Strict("VNDKCOREVARIANT_LIBRARIES_FILE", c.vndkCoreVariantLibrariesFile.String())
ctx.Strict("VNDK_LIBRARIES_FILE", c.vndkLibrariesFile.String())
+ ctx.Strict("SOONG_VNDK_SNAPSHOT_ZIP", c.vndkSnapshotZipFile.String())
}
diff --git a/java/androidmk.go b/java/androidmk.go
index cd91b46..63c7d9a 100644
--- a/java/androidmk.go
+++ b/java/androidmk.go
@@ -612,10 +612,15 @@
fmt.Fprintln(w, ".PHONY: checkapi")
fmt.Fprintln(w, "checkapi:",
- dstubs.apiLintTimestamp.String())
+ dstubs.Name()+"-api-lint")
fmt.Fprintln(w, ".PHONY: droidcore")
fmt.Fprintln(w, "droidcore: checkapi")
+
+ if dstubs.apiLintReport != nil {
+ fmt.Fprintf(w, "$(call dist-for-goals,%s,%s:%s)\n", dstubs.Name()+"-api-lint",
+ dstubs.apiLintReport.String(), "apilint/"+dstubs.Name()+"-lint-report.txt")
+ }
}
if dstubs.checkNullabilityWarningsTimestamp != nil {
fmt.Fprintln(w, ".PHONY:", dstubs.Name()+"-check-nullability-warnings")
diff --git a/java/app.go b/java/app.go
index bd8556e..58b7721 100644
--- a/java/app.go
+++ b/java/app.go
@@ -165,7 +165,6 @@
a.aapt.deps(ctx, sdkDep)
}
- embedJni := a.shouldEmbedJnis(ctx)
for _, jniTarget := range ctx.MultiTargets() {
variation := append(jniTarget.Variations(),
blueprint.Variation{Mutator: "link", Variation: "shared"})
@@ -174,7 +173,7 @@
}
ctx.AddFarVariationDependencies(variation, tag, a.appProperties.Jni_libs...)
if String(a.appProperties.Stl) == "c++_shared" {
- if embedJni {
+ if a.shouldEmbedJnis(ctx) {
ctx.AddFarVariationDependencies(variation, tag, "ndk_libc++_shared")
}
}
diff --git a/java/builder.go b/java/builder.go
index 169d853..b5dc88a 100644
--- a/java/builder.go
+++ b/java/builder.go
@@ -38,7 +38,7 @@
// this, all java rules write into separate directories and then are combined into a .jar file
// (if the rule produces .class files) or a .srcjar file (if the rule produces .java files).
// .srcjar files are unzipped into a temporary directory when compiled with javac.
- javac = pctx.AndroidGomaStaticRule("javac",
+ javac = pctx.AndroidRemoteStaticRule("javac", android.SUPPORTS_GOMA,
blueprint.RuleParams{
Command: `rm -rf "$outDir" "$annoDir" "$srcJarDir" && mkdir -p "$outDir" "$annoDir" "$srcJarDir" && ` +
`${config.ZipSyncCmd} -d $srcJarDir -l $srcJarDir/list -f "*.java" $srcJars && ` +
@@ -238,12 +238,14 @@
flags javaBuilderFlags, deps android.Paths) {
deps = append(deps, srcJars...)
+ classpath := flags.classpath
var bootClasspath string
if flags.javaVersion.usesJavaModules() {
var systemModuleDeps android.Paths
bootClasspath, systemModuleDeps = flags.systemModules.FormJavaSystemModulesPath(ctx.Device())
deps = append(deps, systemModuleDeps...)
+ classpath = append(flags.java9Classpath, classpath...)
} else {
deps = append(deps, flags.bootClasspath...)
if len(flags.bootClasspath) == 0 && ctx.Device() {
@@ -255,7 +257,7 @@
}
}
- deps = append(deps, flags.classpath...)
+ deps = append(deps, classpath...)
deps = append(deps, flags.processorPath...)
processor := "-proc:none"
@@ -278,7 +280,7 @@
Args: map[string]string{
"annoDir": android.PathForModuleOut(ctx, intermediatesDir, "anno").String(),
"bootClasspath": bootClasspath,
- "classpath": flags.classpath.FormJavaClassPath("-classpath"),
+ "classpath": classpath.FormJavaClassPath("-classpath"),
"javacFlags": flags.javacFlags,
"javaVersion": flags.javaVersion.String(),
"outDir": android.PathForModuleOut(ctx, "javac", "classes.xref").String(),
diff --git a/java/droiddoc.go b/java/droiddoc.go
index 6f3b152..5d01b54 100644
--- a/java/droiddoc.go
+++ b/java/droiddoc.go
@@ -1182,6 +1182,7 @@
updateCurrentApiTimestamp android.WritablePath
checkLastReleasedApiTimestamp android.WritablePath
apiLintTimestamp android.WritablePath
+ apiLintReport android.WritablePath
checkNullabilityWarningsTimestamp android.WritablePath
@@ -1552,6 +1553,8 @@
} else {
cmd.Flag("--api-lint")
}
+ d.apiLintReport = android.PathForModuleOut(ctx, "api_lint_report.txt")
+ cmd.FlagWithOutput("--report-even-if-suppressed ", d.apiLintReport)
d.inclusionAnnotationsFlags(ctx, cmd)
d.mergeAnnoDirFlags(ctx, cmd)
diff --git a/java/kotlin.go b/java/kotlin.go
index f8ae229..aa65314 100644
--- a/java/kotlin.go
+++ b/java/kotlin.go
@@ -26,7 +26,7 @@
"github.com/google/blueprint"
)
-var kotlinc = pctx.AndroidGomaStaticRule("kotlinc",
+var kotlinc = pctx.AndroidRemoteStaticRule("kotlinc", android.SUPPORTS_GOMA,
blueprint.RuleParams{
Command: `rm -rf "$classesDir" "$srcJarDir" "$kotlinBuildFile" "$emptyDir" && ` +
`mkdir -p "$classesDir" "$srcJarDir" "$emptyDir" && ` +
@@ -88,7 +88,7 @@
})
}
-var kapt = pctx.AndroidGomaStaticRule("kapt",
+var kapt = pctx.AndroidRemoteStaticRule("kapt", android.SUPPORTS_GOMA,
blueprint.RuleParams{
Command: `rm -rf "$srcJarDir" "$kotlinBuildFile" "$kaptDir" && mkdir -p "$srcJarDir" "$kaptDir" && ` +
`${config.ZipSyncCmd} -d $srcJarDir -l $srcJarDir/list -f "*.java" $srcJars && ` +