Merge "Add support for generating boot profiles."
diff --git a/android/testing.go b/android/testing.go
index 12e30ec..b59f399 100644
--- a/android/testing.go
+++ b/android/testing.go
@@ -376,7 +376,7 @@
var p AndroidMkEntriesProvider
var ok bool
if p, ok = mod.(AndroidMkEntriesProvider); !ok {
- t.Errorf("module does not implmement AndroidMkEntriesProvider: " + mod.Name())
+ t.Errorf("module does not implement AndroidMkEntriesProvider: " + mod.Name())
}
entries := p.AndroidMkEntries()
entries.fillInEntries(config, bpPath, mod)
@@ -387,7 +387,7 @@
var p AndroidMkDataProvider
var ok bool
if p, ok = mod.(AndroidMkDataProvider); !ok {
- t.Errorf("module does not implmement AndroidMkDataProvider: " + mod.Name())
+ t.Errorf("module does not implement AndroidMkDataProvider: " + mod.Name())
}
data := p.AndroidMk()
data.fillInData(config, bpPath, mod)
diff --git a/apex/apex.go b/apex/apex.go
index 8b0f385..0466ccb 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -944,7 +944,7 @@
}
if a.apexTypes.image() {
// Build rule for unflattened APEX is created even when ctx.Config().FlattenApex()
- // is true. This is to support referencing APEX via ":<module_name" syntax
+ // is true. This is to support referencing APEX via ":<module_name>" syntax
// in other modules. It is in AndroidMk where the selection of flattened
// or unflattened APEX is made.
a.buildUnflattenedApex(ctx, imageApex)
diff --git a/cc/library.go b/cc/library.go
index cb31979..24985df 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -959,7 +959,11 @@
}
library.baseInstaller.subDir = "bootstrap"
}
+ } else if android.DirectlyInAnyApex(ctx, ctx.ModuleName()) && ctx.isLlndk(ctx.Config()) && !isBionic(ctx.baseModuleName()) {
+ // Skip installing LLNDK (non-bionic) libraries moved to APEX.
+ ctx.Module().SkipInstall()
}
+
library.baseInstaller.install(ctx, file)
}
diff --git a/cc/makevars.go b/cc/makevars.go
index 2b49772..a42429f 100644
--- a/cc/makevars.go
+++ b/cc/makevars.go
@@ -63,6 +63,13 @@
}
}
+type notOnHostContext struct {
+}
+
+func (c *notOnHostContext) Host() bool {
+ return false
+}
+
func makeVarsProvider(ctx android.MakeVarsContext) {
vendorPublicLibraries := vendorPublicLibraries(ctx.Config())
@@ -102,13 +109,23 @@
// Therefore, by removing the library here, we cause it to only be installed if libc
// depends on it.
installedLlndkLibraries := []string{}
+
+ // Make uses LLNDK_MOVED_TO_APEX_LIBRARIES to avoid installing libraries on /system if
+ // they been moved to an apex.
+ movedToApexLlndkLibraries := []string{}
for _, lib := range *llndkLibraries(ctx.Config()) {
if strings.HasPrefix(lib, "libclang_rt.hwasan-") {
continue
}
installedLlndkLibraries = append(installedLlndkLibraries, lib)
+
+ // Skip bionic libs, they are handled in different manner
+ if android.DirectlyInAnyApex(¬OnHostContext{}, lib) && !isBionic(lib) {
+ movedToApexLlndkLibraries = append(movedToApexLlndkLibraries, lib)
+ }
}
ctx.Strict("LLNDK_LIBRARIES", strings.Join(installedLlndkLibraries, " "))
+ ctx.Strict("LLNDK_MOVED_TO_APEX_LIBRARIES", strings.Join(movedToApexLlndkLibraries, " "))
ctx.Strict("VNDK_PRIVATE_LIBRARIES", strings.Join(*vndkPrivateLibraries(ctx.Config()), " "))
ctx.Strict("VNDK_USING_CORE_VARIANT_LIBRARIES", strings.Join(*vndkUsingCoreVariantLibraries(ctx.Config()), " "))
diff --git a/cc/vndk.go b/cc/vndk.go
index f9f3764..2c78047 100644
--- a/cc/vndk.go
+++ b/cc/vndk.go
@@ -31,7 +31,7 @@
// declared as a VNDK or VNDK-SP module. The vendor variant
// will be installed in /system instead of /vendor partition.
//
- // `vendor_vailable` must be explicitly set to either true or
+ // `vendor_available` must be explicitly set to either true or
// false together with `vndk: {enabled: true}`.
Enabled *bool
diff --git a/ui/build/goma.go b/ui/build/goma.go
index ff0b40e..ae9b784 100644
--- a/ui/build/goma.go
+++ b/ui/build/goma.go
@@ -72,6 +72,7 @@
}
cmd := Command(ctx, config, "goma_ctl.py ensure_start", gomaCtl, "ensure_start")
+ cmd.Environment.Set("DIST_DIR", config.DistDir())
if output, err := cmd.CombinedOutput(); err != nil {
ctx.Fatalf("goma_ctl.py ensure_start failed with: %v\n%s\n", err, output)
diff --git a/ui/build/paths/config.go b/ui/build/paths/config.go
index 1a7412d..b169666 100644
--- a/ui/build/paths/config.go
+++ b/ui/build/paths/config.go
@@ -74,11 +74,8 @@
}
var Configuration = map[string]PathConfig{
- "bash": Allowed,
- "bc": Allowed,
- // We need bzip2 here even though we provide a bzip2 binary because
- // GNU tar seems to avoid calling ours.
- "bzip2": Allowed,
+ "bash": Allowed,
+ "bc": Allowed,
"dd": Allowed,
"diff": Allowed,
"dlv": Allowed,