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

Commit 27d35885 authored by Bill Rassieur's avatar Bill Rassieur
Browse files

Merge master@5406228 into git_qt-dev-plus-aosp. 

Change-Id: I28b591a5816adbefb89d2617e74f0aac5156325b
BUG: 129345239
parents 5b284c4e 120e1f03

Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ bootstrap_go_package { 
        "android/namespace.go",

        "android/neverallow.go",

        "android/onceper.go",

        "android/override_module.go",

        "android/package_ctx.go",

        "android/path_properties.go",

        "android/paths.go",
@@ -103,6 +104,7 @@ bootstrap_go_package { 
        "cc/config/global.go",

        "cc/config/tidy.go",

        "cc/config/toolchain.go",

        "cc/config/vndk.go",



        "cc/config/arm_device.go",

        "cc/config/arm64_device.go",

android/androidmk.go

+1 −1
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ func translateAndroidModule(ctx SingletonContext, w io.Writer, mod blueprint.Mod 
		}

	}



	if amod.noticeFile != nil {

	if amod.noticeFile.Valid() {

		fmt.Fprintln(&data.preamble, "LOCAL_NOTICE_FILE :=", amod.noticeFile.String())

	}

android/config.go

+10 −2
Original line number Diff line number Diff line
@@ -475,8 +475,12 @@ func (c *config) DeviceName() string { 
	return *c.productVariables.DeviceName

}



func (c *config) ResourceOverlays() []string {

	return c.productVariables.ResourceOverlays

func (c *config) DeviceResourceOverlays() []string {

	return c.productVariables.DeviceResourceOverlays

}



func (c *config) ProductResourceOverlays() []string {

	return c.productVariables.ProductResourceOverlays

}



func (c *config) PlatformVersionName() string {
@@ -818,6 +822,10 @@ func (c *deviceConfig) ExtraVndkVersions() []string { 
	return c.config.productVariables.ExtraVndkVersions

}



func (c *deviceConfig) VndkUseCoreVariant() bool {

	return Bool(c.config.productVariables.VndkUseCoreVariant)

}



func (c *deviceConfig) SystemSdkVersions() []string {

	return c.config.productVariables.DeviceSystemSdkVersions

}

android/module.go

+12 −4
Original line number Diff line number Diff line
@@ -189,6 +189,7 @@ type Module interface { 
	InstallInRecovery() bool

	SkipInstall()

	ExportedToMake() bool

	NoticeFile() OptionalPath



	AddProperties(props ...interface{})

	GetProperties() []interface{}
@@ -466,7 +467,7 @@ type ModuleBase struct { 
	noAddressSanitizer bool

	installFiles       Paths

	checkbuildFiles    Paths

	noticeFile         Path

	noticeFile         OptionalPath



	// Used by buildTargetSingleton to create checkbuild and per-directory build targets

	// Only set on the final variant of each module
@@ -667,6 +668,10 @@ func (a *ModuleBase) Owner() string { 
	return String(a.commonProperties.Owner)

}



func (a *ModuleBase) NoticeFile() OptionalPath {

	return a.noticeFile

}



func (a *ModuleBase) generateModuleTarget(ctx ModuleContext) {

	allInstalledFiles := Paths{}

	allCheckbuildFiles := Paths{}
@@ -852,9 +857,12 @@ func (a *ModuleBase) GenerateBuildActions(blueprintCtx blueprint.ModuleContext) 
		a.installFiles = append(a.installFiles, ctx.installFiles...)

		a.checkbuildFiles = append(a.checkbuildFiles, ctx.checkbuildFiles...)



		if a.commonProperties.Notice != nil {

			// For filegroup-based notice file references.

			a.noticeFile = PathForModuleSrc(ctx, *a.commonProperties.Notice)

		notice := proptools.StringDefault(a.commonProperties.Notice, "NOTICE")

		if m := SrcIsModule(notice); m != "" {

			a.noticeFile = ctx.ExpandOptionalSource(&notice, "notice")

		} else {

			noticePath := filepath.Join(ctx.ModuleDir(), notice)

			a.noticeFile = ExistentPathForSource(ctx, noticePath)

		}

	}

android/mutator.go

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ var preArch = []RegisterMutatorFunc{ 
	RegisterNamespaceMutator,

	RegisterPrebuiltsPreArchMutators,

	RegisterDefaultsPreArchMutators,

	RegisterOverridePreArchMutators,

}



func registerArchMutator(ctx RegisterMutatorsContext) {