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

Commit 0fad9a30 authored by Inseob Kim's avatar Inseob Kim Committed by Automerger Merge Worker
Browse files

Merge "Allow apex to use generated file_contexts" into main am: 6a4bb378 am:... 

Merge "Allow apex to use generated file_contexts" into main am: 6a4bb378 am: fb1d783e am: acb2a710

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2836495



Change-Id: I3249b4499ff4847d6ce07e04df09c493345a68f6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 31e40af7 acb2a710

apex/builder.go

+3 −1
Original line number Diff line number Diff line
@@ -344,10 +344,12 @@ func (a *apexBundle) buildManifest(ctx android.ModuleContext, provideNativeLibs, 
func (a *apexBundle) buildFileContexts(ctx android.ModuleContext) android.OutputPath {

	var fileContexts android.Path

	var fileContextsDir string

	isFileContextsModule := false

	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 != "" {

			isFileContextsModule = true

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

			fileContextsDir = ctx.OtherModuleDir(otherModule)

		}
@@ -363,7 +365,7 @@ func (a *apexBundle) buildFileContexts(ctx android.ModuleContext) android.Output 
			ctx.PropertyErrorf("file_contexts", "should be under system/sepolicy, but found in  %q", fileContextsDir)

		}

	}

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

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

		ctx.PropertyErrorf("file_contexts", "cannot find file_contexts file: %q", fileContexts.String())

	}