apex: Don't run apex mutators if disabled am: 49f6701e9a am: c080abef85 am:... (f549fde1) · Commits · e / os / android_build_soong

apex/apex.go

+10 −1

Original line number	Diff line number	Diff line
		@@ -853,10 +853,13 @@ func RegisterPostDepsMutators(ctx android.RegisterMutatorsContext) {
		// Mark the direct and transitive dependencies of apex bundles so that they
		// can be built for the apex bundles.
		func apexDepsMutator(mctx android.TopDownMutatorContext) {
		if !mctx.Module().Enabled() {
		return
		}
		var apexBundles []android.ApexInfo
		var directDep bool
		if a, ok := mctx.Module().(*apexBundle); ok && !a.vndkApex {
		apexBundles = []android.ApexInfo{android.ApexInfo{
		apexBundles = []android.ApexInfo{{
		ApexName: mctx.ModuleName(),
		MinSdkVersion: a.minSdkVersion(mctx),
		}}
		@@ -894,6 +897,9 @@ func inAnySdk(module android.Module) bool {

		// Create apex variations if a module is included in APEX(s).
		func apexMutator(mctx android.BottomUpMutatorContext) {
		if !mctx.Module().Enabled() {
		return
		}
		if am, ok := mctx.Module().(android.ApexModule); ok && am.CanHaveApexVariants() {
		am.CreateApexVariations(mctx)
		} else if a, ok := mctx.Module().(*apexBundle); ok && !a.vndkApex {
		@@ -931,6 +937,9 @@ func addFlattenedFileContextsInfos(ctx android.BaseModuleContext, fileContextsIn
		}

		func apexFlattenedMutator(mctx android.BottomUpMutatorContext) {
		if !mctx.Module().Enabled() {
		return
		}
		if ab, ok := mctx.Module().(*apexBundle); ok {
		var variants []string
		switch proptools.StringDefault(ab.properties.Payload_type, "image") {

+21 −0

Original line number	Diff line number	Diff line
		@@ -4205,6 +4205,27 @@ func TestApexWithJniLibs(t *testing.T) {
		})
		}

		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 TestApexWithJniLibs_Errors(t *testing.T) {
		testApexError(t, `jni_libs: "xxx" is not a cc_library`, `
		apex {