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

Commit 5aeb9fd4 authored by Cole Faust's avatar Cole Faust
Browse files

Remove dependencies on the 1-variant fallback 

When adding a dependencies, if the variants don't match, but the
dependency only has 1 variant anyways, soong will always use that
variant. This makes it hard to add new variants to soong, because the
1-variant fallback stops being used and you start getting missing
variant errors. Make changes to bp files such that all dependencies
correctly specify the variant to use.

Bug: 372091092
Flag: EXEMPT refactor
Test: m nothing
Change-Id: I305d9a549fc132c3d14f56eae1abbac1b9defd10
parent 397dfb6e

AconfigFlags.bp

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ aconfig_declarations_group { 


filegroup {

    name: "framework-minus-apex-aconfig-srcjars",

    srcs: [

    device_common_srcs: [

        ":framework-minus-apex-aconfig-declarations{.srcjars}",

    ],

}

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ license { 


filegroup {

    name: "framework-non-updatable-sources",

    srcs: [

    device_common_srcs: [

        // Java/AIDL sources under frameworks/base

        ":framework-annotations",

        ":framework-blobstore-sources",

apct-tests/perftests/core/apps/reources_manager/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ android_test_helper_app { 
    static_libs: ["androidx.appcompat_appcompat"],

}



genrule {

java_genrule {

    name: "LargeResourcesUncompressed",

    srcs: [":LargeResourcesCompressed"],

    out: ["LargeResourcesUncompressed.apk"],

api/Android.bp

+13 −13
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ combined_apis { 
    }),

}



genrule {

java_genrule {

    name: "frameworks-base-api-current-compat",

    srcs: [

        ":android.api.public.latest",
@@ -140,7 +140,7 @@ genrule { 
        "$(location :frameworks-base-api-current.txt)",

}



genrule {

java_genrule {

    name: "frameworks-base-api-system-current-compat",

    srcs: [

        ":android.api.public.latest",
@@ -160,7 +160,7 @@ genrule { 
        "$(location :frameworks-base-api-system-current.txt)",

}



genrule {

java_genrule {

    name: "frameworks-base-api-module-lib-current-compat",

    srcs: [

        ":android.api.public.latest",
@@ -184,7 +184,7 @@ genrule { 
        "$(location :frameworks-base-api-module-lib-current.txt)",

}



genrule {

java_genrule {

    name: "frameworks-base-api-current.srcjar",

    tools: ["merge_zips"],

    out: ["current.srcjar"],
@@ -209,7 +209,7 @@ genrule_defaults { 
        "$(location soong_zip) -o $(out) -C $(genDir)/out -D $(genDir)/out",

}



genrule {

java_genrule {

    name: "sdk-annotations.zip",

    defaults: ["sdk-annotations-defaults"],

    srcs: [
@@ -218,7 +218,7 @@ genrule { 
    ],

}



genrule {

java_genrule {

    name: "sdk-annotations-system.zip",

    defaults: ["sdk-annotations-defaults"],

    srcs: [
@@ -227,7 +227,7 @@ genrule { 
    ],

}



genrule {

java_genrule {

    name: "sdk-annotations-module-lib.zip",

    defaults: ["sdk-annotations-defaults"],

    srcs: [
@@ -236,7 +236,7 @@ genrule { 
    ],

}



genrule {

java_genrule {

    name: "sdk-annotations-system-server.zip",

    defaults: ["sdk-annotations-defaults"],

    srcs: [
@@ -245,7 +245,7 @@ genrule { 
    ],

}



genrule {

java_genrule {

    name: "combined-removed-dex",

    visibility: [

        "//frameworks/base/boot",
@@ -460,7 +460,7 @@ genrule_defaults { 
    tools: ["extract-flagged-apis"],

}



genrule {

java_genrule {

    name: "flag-api-mapping-PublicApi",

    defaults: ["flag-api-mapping-generation-defaults"],

    srcs: [":frameworks-base-api-current.txt"],
@@ -470,7 +470,7 @@ genrule { 
    },

}



genrule {

java_genrule {

    name: "flag-api-mapping-SystemApi",

    defaults: ["flag-api-mapping-generation-defaults"],

    srcs: [":frameworks-base-api-system-current.txt"],
@@ -480,7 +480,7 @@ genrule { 
    },

}



genrule {

java_genrule {

    name: "flag-api-mapping-ModuleLibApi",

    defaults: ["flag-api-mapping-generation-defaults"],

    srcs: [":frameworks-base-api-module-lib-current.txt"],
@@ -490,7 +490,7 @@ genrule { 
    },

}



genrule {

java_genrule {

    name: "flag-api-mapping-SystemServerApi",

    defaults: ["flag-api-mapping-generation-defaults"],

    srcs: [":frameworks-base-api-system-server-current.txt"],

api/api.go

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



	"android/soong/android"

	"android/soong/genrule"

	"android/soong/java"

)
@@ -140,6 +139,7 @@ type libraryProps struct { 
type fgProps struct {

	Name               *string

	Srcs               proptools.Configurable[[]string]

	Device_common_srcs proptools.Configurable[[]string]

	Visibility         []string

}
@@ -201,7 +201,7 @@ func createMergedTxt(ctx android.LoadHookContext, txt MergedTxtDefinition, stubs 
		}

	}

	props.Visibility = []string{"//visibility:public"}

	ctx.CreateModule(genrule.GenRuleFactory, &props)

	ctx.CreateModule(java.GenRuleFactory, &props)

}



func createMergedAnnotationsFilegroups(ctx android.LoadHookContext, modules, system_server_modules proptools.Configurable[[]string]) {
@@ -230,7 +230,7 @@ func createMergedAnnotationsFilegroups(ctx android.LoadHookContext, modules, sys 
	} {

		props := fgProps{}

		props.Name = proptools.StringPtr(i.name)

		props.Srcs = createSrcs(i.modules, i.tag)

		props.Device_common_srcs = createSrcs(i.modules, i.tag)

		ctx.CreateModule(android.FileGroupFactory, &props)

	}

}
@@ -429,7 +429,7 @@ func createMergedFrameworkSystemServerExportableStubs(ctx android.LoadHookContex 
func createPublicStubsSourceFilegroup(ctx android.LoadHookContext, modules proptools.Configurable[[]string]) {

	props := fgProps{}

	props.Name = proptools.StringPtr("all-modules-public-stubs-source")

	props.Srcs = createSrcs(modules, "{.public.stubs.source}")

	props.Device_common_srcs = createSrcs(modules, "{.public.stubs.source}")

	props.Visibility = []string{"//frameworks/base"}

	ctx.CreateModule(android.FileGroupFactory, &props)

}