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

Commit f73da3ef authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "rust: add aconfig_flag support" into main am: 5ada6c27 

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



Change-Id: Ide278450fa058b6dc565bff395f541dc7b574905
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 558e2bd1 5ada6c27

rust/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ bootstrap_go_package { 
    pkgPath: "android/soong/rust",

    deps: [

        "soong",

        "soong-aconfig",

        "soong-android",

        "soong-bloaty",

        "soong-cc",

rust/androidmk.go

+2 −1
Original line number Diff line number Diff line
@@ -66,7 +66,8 @@ func (mod *Module) AndroidMkEntries() []android.AndroidMkEntries { 
				if mod.UseVndk() {

					entries.SetBool("LOCAL_USE_VNDK", true)

				}



				// TODO(b/311155208): The container here should be system.

				entries.SetPaths("LOCAL_ACONFIG_FILES", mod.mergedAconfigFiles[""])

			},

		},

	}

rust/rust.go

+6 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import ( 
	"github.com/google/blueprint"

	"github.com/google/blueprint/proptools"



	"android/soong/aconfig"

	"android/soong/android"

	"android/soong/cc"

	cc_config "android/soong/cc/config"
@@ -176,6 +177,9 @@ type Module struct { 
	transitiveAndroidMkSharedLibs *android.DepSet[string]



	android.BazelModuleBase



	// Aconfig files for all transitive deps.  Also exposed via TransitiveDeclarationsInfo

	mergedAconfigFiles map[string]android.Paths

}



func (mod *Module) Header() bool {
@@ -1006,6 +1010,8 @@ func (mod *Module) GenerateAndroidBuildActions(actx android.ModuleContext) { 
	if mod.testModule {

		ctx.SetProvider(testing.TestModuleProviderKey, testing.TestModuleProviderData{})

	}



	aconfig.CollectDependencyAconfigFiles(ctx, &mod.mergedAconfigFiles)

}



func (mod *Module) deps(ctx DepsContext) Deps {