apex: Don't run apex mutators if disabled
apex_deps/apex/apex_flattened mutators don't have to run if module is
disabled.
For some branches which have no valid targets, apex modules are disabled
by the os mutator. e.g. aosp-build-tools
Some enforcement checks which run during those mutators may fail because
build-environment doesn't provide full context information.
For example, "Platform_version_all_codenames" config variable is not
set while apex.min_sdk_version uses one of those codenames.
Bug: 152655956
Test: m
Merged-In: I47e27d2d025ba4c36534708b113ce77c4cb2397b
Change-Id: I47e27d2d025ba4c36534708b113ce77c4cb2397b
(cherry picked from commit 49f6701e9a
)
This commit is contained in:
@@ -4085,6 +4085,27 @@ func TestSymlinksFromApexToSystem(t *testing.T) {
|
||||
ensureRealfileExists(t, files, "lib64/myotherlib.so") // this is a real file
|
||||
}
|
||||
|
||||
func TestApexMutatorsDontRunIfDisabled(t *testing.T) {
|
||||
ctx, _ := testApex(t, `
|
||||
apex {
|
||||
name: "myapex",
|
||||
key: "myapex.key",
|
||||
}
|
||||
apex_key {
|
||||
name: "myapex.key",
|
||||
public_key: "testkey.avbpubkey",
|
||||
private_key: "testkey.pem",
|
||||
}
|
||||
`, func(fs map[string][]byte, config android.Config) {
|
||||
delete(config.Targets, android.Android)
|
||||
config.AndroidCommonTarget = android.Target{}
|
||||
})
|
||||
|
||||
if expected, got := []string{""}, ctx.ModuleVariantsForTests("myapex"); !reflect.DeepEqual(expected, got) {
|
||||
t.Errorf("Expected variants: %v, but got: %v", expected, got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestAppBundle(t *testing.T) {
|
||||
ctx, _ := testApex(t, `
|
||||
apex {
|
||||
|
Reference in New Issue
Block a user