Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 709f0270 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Add system/sepolicy/apex to bp2build allowlist"

parents cf674963 37997c40

android/bazel.go

+1 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ var ( 
		"system/core/property_service/libpropertyinfoparser": Bp2BuildDefaultTrueRecursively,

		"system/libbase":                  Bp2BuildDefaultTrueRecursively,

		"system/logging/liblog":           Bp2BuildDefaultTrueRecursively,

		"system/sepolicy/apex":            Bp2BuildDefaultTrueRecursively,

		"system/timezone/apex":            Bp2BuildDefaultTrueRecursively,

		"system/timezone/output_data":     Bp2BuildDefaultTrueRecursively,

		"external/arm-optimized-routines": Bp2BuildDefaultTrueRecursively,

apex/builder.go

+12 −3
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ package apex 
import (

	"encoding/json"

	"fmt"

	"path"

	"path/filepath"

	"runtime"

	"sort"
@@ -256,14 +255,24 @@ func (a *apexBundle) buildManifest(ctx android.ModuleContext, provideNativeLibs, 
// labeled as system_file.

func (a *apexBundle) buildFileContexts(ctx android.ModuleContext) android.OutputPath {

	var fileContexts android.Path

	var fileContextsDir string

	if a.properties.File_contexts == nil {

		fileContexts = android.PathForSource(ctx, "system/sepolicy/apex", ctx.ModuleName()+"-file_contexts")

	} else {

		if m, t := android.SrcIsModuleWithTag(*a.properties.File_contexts); m != "" {

			otherModule := android.GetModuleFromPathDep(ctx, m, t)

			fileContextsDir = ctx.OtherModuleDir(otherModule)

		}

		fileContexts = android.PathForModuleSrc(ctx, *a.properties.File_contexts)

	}

	if fileContextsDir == "" {

		fileContextsDir = filepath.Dir(fileContexts.String())

	}

	fileContextsDir += string(filepath.Separator)



	if a.Platform() {

		if matched, err := path.Match("system/sepolicy/**/*", fileContexts.String()); err != nil || !matched {

			ctx.PropertyErrorf("file_contexts", "should be under system/sepolicy, but %q", fileContexts)

		if !strings.HasPrefix(fileContextsDir, "system/sepolicy/") {

			ctx.PropertyErrorf("file_contexts", "should be under system/sepolicy, but found in  %q", fileContextsDir)

		}

	}

	if !android.ExistentPathForSource(ctx, fileContexts.String()).Valid() {