add apex_defaults
apex_defaults is the default module for apex. Bug: 124026431 Test: m (apex_test updated) Change-Id: I09f63046e909e8eeb52ecec6bb07eb51e5490561
This commit is contained in:
@@ -33,6 +33,8 @@ func testApex(t *testing.T, bp string) *android.TestContext {
|
||||
ctx := android.NewTestArchContext()
|
||||
ctx.RegisterModuleType("apex", android.ModuleFactoryAdaptor(ApexBundleFactory))
|
||||
ctx.RegisterModuleType("apex_key", android.ModuleFactoryAdaptor(apexKeyFactory))
|
||||
ctx.RegisterModuleType("apex_defaults", android.ModuleFactoryAdaptor(defaultsFactory))
|
||||
ctx.PreArchMutators(android.RegisterDefaultsPreArchMutators)
|
||||
|
||||
ctx.PostDepsMutators(func(ctx android.RegisterMutatorsContext) {
|
||||
ctx.TopDown("apex_deps", apexDepsMutator)
|
||||
@@ -201,8 +203,8 @@ func ensureListNotContains(t *testing.T, result []string, notExpected string) {
|
||||
// Minimal test
|
||||
func TestBasicApex(t *testing.T) {
|
||||
ctx := testApex(t, `
|
||||
apex {
|
||||
name: "myapex",
|
||||
apex_defaults {
|
||||
name: "myapex-defaults",
|
||||
key: "myapex.key",
|
||||
native_shared_libs: ["mylib"],
|
||||
multilib: {
|
||||
@@ -212,6 +214,11 @@ func TestBasicApex(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
apex {
|
||||
name: "myapex",
|
||||
defaults: ["myapex-defaults"],
|
||||
}
|
||||
|
||||
apex_key {
|
||||
name: "myapex.key",
|
||||
public_key: "testkey.avbpubkey",
|
||||
|
Reference in New Issue
Block a user