Merge "Allow surfaceflinger to access bufferhub"
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
index ccb3a50..b2b38ea 100644
--- a/PREUPLOAD.cfg
+++ b/PREUPLOAD.cfg
@@ -2,3 +2,6 @@
whitespace = tools/whitespace.sh ${PREUPLOAD_FILES}
aosp_hook = ${REPO_ROOT}/frameworks/base/tools/aosp/aosp_sha.sh ${PREUPLOAD_COMMIT} "."
policy_version_check = tools/policy_version_check.sh
+
+[Builtin Hooks]
+gofmt = true
diff --git a/build/soong/cil_compat_map.go b/build/soong/cil_compat_map.go
index 2402d75..9d01d93 100644
--- a/build/soong/cil_compat_map.go
+++ b/build/soong/cil_compat_map.go
@@ -22,32 +22,32 @@
"fmt"
"io"
- "github.com/google/blueprint/proptools"
"github.com/google/blueprint"
+ "github.com/google/blueprint/proptools"
)
var (
pctx = android.NewPackageContext("android/soong/selinux")
- combine_maps = pctx.HostBinToolVariable("combine_maps", "combine_maps")
- combineMapsCmd = "${combine_maps} -t ${topHalf} -b ${bottomHalf} -o $out"
+ combine_maps = pctx.HostBinToolVariable("combine_maps", "combine_maps")
+ combineMapsCmd = "${combine_maps} -t ${topHalf} -b ${bottomHalf} -o $out"
combineMapsRule = pctx.StaticRule(
"combineMapsRule",
blueprint.RuleParams{
- Command: combineMapsCmd,
+ Command: combineMapsCmd,
CommandDeps: []string{"${combine_maps}"},
},
"topHalf",
"bottomHalf",
)
- String = proptools.String
+ String = proptools.String
TopHalfDepTag = dependencyTag{name: "top"}
)
func init() {
android.RegisterModuleType("se_cil_compat_map", cilCompatMapFactory)
- pctx.Import("android/soong/common")
+ pctx.Import("android/soong/android")
}
func cilCompatMapFactory() android.Module {
@@ -140,17 +140,17 @@
})
topHalf := expandTopHalf(ctx)
- if (topHalf.Valid()) {
+ if topHalf.Valid() {
out := android.PathForModuleGen(ctx, c.Name())
ctx.ModuleBuild(pctx, android.ModuleBuildParams{
- Rule: combineMapsRule,
+ Rule: combineMapsRule,
Output: out,
Implicits: []android.Path{
topHalf.Path(),
bottomHalf,
},
Args: map[string]string{
- "topHalf": topHalf.String(),
+ "topHalf": topHalf.String(),
"bottomHalf": bottomHalf.String(),
},
})
@@ -162,7 +162,7 @@
func (c *cilCompatMap) DepsMutator(ctx android.BottomUpMutatorContext) {
android.ExtractSourcesDeps(ctx, c.properties.Bottom_half)
- if (c.properties.Top_half != nil) {
+ if c.properties.Top_half != nil {
ctx.AddDependency(c, TopHalfDepTag, String(c.properties.Top_half))
}
}
diff --git a/private/system_server_startup.te b/private/system_server_startup.te
index ad9fb44..f1427a9 100644
--- a/private/system_server_startup.te
+++ b/private/system_server_startup.te
@@ -18,3 +18,6 @@
# system_server domain
allow system_server_startup self:process setcurrent;
allow system_server_startup system_server:process dyntransition;
+
+# Child of the zygote.
+allow system_server_startup zygote:process sigchld;