Merge "Add aconfig flag support for runtime_resource_overlay" into main am: 7f75245402
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3005019 Change-Id: I5419552dabcb97beec2a73cc19d1f7e2cb5784cb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -122,6 +122,10 @@ func (r *RuntimeResourceOverlay) DepsMutator(ctx android.BottomUpMutatorContext)
|
|||||||
|
|
||||||
ctx.AddVariationDependencies(nil, staticLibTag, r.properties.Static_libs...)
|
ctx.AddVariationDependencies(nil, staticLibTag, r.properties.Static_libs...)
|
||||||
ctx.AddVariationDependencies(nil, libTag, r.properties.Resource_libs...)
|
ctx.AddVariationDependencies(nil, libTag, r.properties.Resource_libs...)
|
||||||
|
|
||||||
|
for _, aconfig_declaration := range r.aaptProperties.Flags_packages {
|
||||||
|
ctx.AddDependency(ctx.Module(), aconfigDeclarationTag, aconfig_declaration)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *RuntimeResourceOverlay) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
func (r *RuntimeResourceOverlay) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
||||||
@@ -151,6 +155,7 @@ func (r *RuntimeResourceOverlay) GenerateAndroidBuildActions(ctx android.ModuleC
|
|||||||
sdkContext: r,
|
sdkContext: r,
|
||||||
enforceDefaultTargetSdkVersion: false,
|
enforceDefaultTargetSdkVersion: false,
|
||||||
extraLinkFlags: aaptLinkFlags,
|
extraLinkFlags: aaptLinkFlags,
|
||||||
|
aconfigTextFiles: getAconfigFilePaths(ctx),
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@@ -405,3 +405,49 @@ func TestRuntimeResourceOverlayPartition(t *testing.T) {
|
|||||||
android.AssertPathRelativeToTopEquals(t, "Install dir is not correct for "+testCase.name, testCase.expectedPath, mod.installDir)
|
android.AssertPathRelativeToTopEquals(t, "Install dir is not correct for "+testCase.name, testCase.expectedPath, mod.installDir)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestRuntimeResourceOverlayFlagsPackages(t *testing.T) {
|
||||||
|
result := android.GroupFixturePreparers(
|
||||||
|
prepareForJavaTest,
|
||||||
|
).RunTestWithBp(t, `
|
||||||
|
runtime_resource_overlay {
|
||||||
|
name: "foo",
|
||||||
|
sdk_version: "current",
|
||||||
|
flags_packages: [
|
||||||
|
"bar",
|
||||||
|
"baz",
|
||||||
|
],
|
||||||
|
}
|
||||||
|
aconfig_declarations {
|
||||||
|
name: "bar",
|
||||||
|
package: "com.example.package.bar",
|
||||||
|
srcs: [
|
||||||
|
"bar.aconfig",
|
||||||
|
],
|
||||||
|
}
|
||||||
|
aconfig_declarations {
|
||||||
|
name: "baz",
|
||||||
|
package: "com.example.package.baz",
|
||||||
|
srcs: [
|
||||||
|
"baz.aconfig",
|
||||||
|
],
|
||||||
|
}
|
||||||
|
`)
|
||||||
|
|
||||||
|
foo := result.ModuleForTests("foo", "android_common")
|
||||||
|
|
||||||
|
// runtime_resource_overlay module depends on aconfig_declarations listed in flags_packages
|
||||||
|
android.AssertBoolEquals(t, "foo expected to depend on bar", true,
|
||||||
|
CheckModuleHasDependency(t, result.TestContext, "foo", "android_common", "bar"))
|
||||||
|
|
||||||
|
android.AssertBoolEquals(t, "foo expected to depend on baz", true,
|
||||||
|
CheckModuleHasDependency(t, result.TestContext, "foo", "android_common", "baz"))
|
||||||
|
|
||||||
|
aapt2LinkRule := foo.Rule("android/soong/java.aapt2Link")
|
||||||
|
linkInFlags := aapt2LinkRule.Args["inFlags"]
|
||||||
|
android.AssertStringDoesContain(t,
|
||||||
|
"aapt2 link command expected to pass feature flags arguments",
|
||||||
|
linkInFlags,
|
||||||
|
"--feature-flags @out/soong/.intermediates/bar/intermediate.txt --feature-flags @out/soong/.intermediates/baz/intermediate.txt",
|
||||||
|
)
|
||||||
|
}
|
||||||
|
Reference in New Issue
Block a user