Merge "Remove unused uses_sdks property for apexes" (a6fcf9fd) · Commits · e / os / android_build_soong

android/apex.go

+0 −6

Original line number	Diff line number	Diff line
		@@ -58,9 +58,6 @@ type ApexInfo struct {
		// to true.
		UsePlatformApis bool

		// The list of SDK modules that the containing apexBundle depends on.
		RequiredSdks SdkRefs

		// List of Apex variant names that this module is associated with. This initially is the
		// same as the `ApexVariationName` field. Then when multiple apex variants are merged in
		// mergeApexVariations, ApexInfo struct of the merged variant holds the list of apexBundles
		@@ -110,9 +107,6 @@ func (i ApexInfo) AddJSONData(d *map[string]interface{}) {
		// thus wouldn't be merged.
		func (i ApexInfo) mergedName(ctx PathContext) string {
		name := "apex" + strconv.Itoa(i.MinSdkVersion.FinalOrFutureInt())
		for _, sdk := range i.RequiredSdks {
		name += "_" + sdk.Name + "_" + sdk.Version
		}
		return name
		}

android/apex_test.go

+25 −40

Original line number	Diff line number	Diff line
		@@ -33,10 +33,10 @@ func Test_mergeApexVariations(t *testing.T) {
		{
		name: "single",
		in: []ApexInfo{
		{"foo", FutureApiLevel, false, false, nil, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex},
		{"foo", FutureApiLevel, false, false, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex},
		},
		wantMerged: []ApexInfo{
		{"apex10000", FutureApiLevel, false, false, nil, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex},
		{"apex10000", FutureApiLevel, false, false, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex},
		},
		wantAliases: [][2]string{
		{"foo", "apex10000"},
		@@ -45,25 +45,25 @@ func Test_mergeApexVariations(t *testing.T) {
		{
		name: "merge",
		in: []ApexInfo{
		{"foo", FutureApiLevel, false, false, SdkRefs{{"baz", "1"}}, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex},
		{"bar", FutureApiLevel, false, false, SdkRefs{{"baz", "1"}}, []string{"bar"}, []string{"bar"}, nil, NotForPrebuiltApex},
		{"foo", FutureApiLevel, false, false, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex},
		{"bar", FutureApiLevel, false, false, []string{"bar"}, []string{"bar"}, nil, NotForPrebuiltApex},
		},
		wantMerged: []ApexInfo{
		{"apex10000_baz_1", FutureApiLevel, false, false, SdkRefs{{"baz", "1"}}, []string{"bar", "foo"}, []string{"bar", "foo"}, nil, false}},
		{"apex10000", FutureApiLevel, false, false, []string{"bar", "foo"}, []string{"bar", "foo"}, nil, false}},
		wantAliases: [][2]string{
		{"bar", "apex10000_baz_1"},
		{"foo", "apex10000_baz_1"},
		{"bar", "apex10000"},
		{"foo", "apex10000"},
		},
		},
		{
		name: "don't merge version",
		in: []ApexInfo{
		{"foo", FutureApiLevel, false, false, nil, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex},
		{"bar", uncheckedFinalApiLevel(30), false, false, nil, []string{"bar"}, []string{"bar"}, nil, NotForPrebuiltApex},
		{"foo", FutureApiLevel, false, false, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex},
		{"bar", uncheckedFinalApiLevel(30), false, false, []string{"bar"}, []string{"bar"}, nil, NotForPrebuiltApex},
		},
		wantMerged: []ApexInfo{
		{"apex30", uncheckedFinalApiLevel(30), false, false, nil, []string{"bar"}, []string{"bar"}, nil, NotForPrebuiltApex},
		{"apex10000", FutureApiLevel, false, false, nil, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex},
		{"apex30", uncheckedFinalApiLevel(30), false, false, []string{"bar"}, []string{"bar"}, nil, NotForPrebuiltApex},
		{"apex10000", FutureApiLevel, false, false, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex},
		},
		wantAliases: [][2]string{
		{"bar", "apex30"},
		@@ -73,44 +73,29 @@ func Test_mergeApexVariations(t *testing.T) {
		{
		name: "merge updatable",
		in: []ApexInfo{
		{"foo", FutureApiLevel, false, false, nil, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex},
		{"bar", FutureApiLevel, true, false, nil, []string{"bar"}, []string{"bar"}, nil, NotForPrebuiltApex},
		{"foo", FutureApiLevel, false, false, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex},
		{"bar", FutureApiLevel, true, false, []string{"bar"}, []string{"bar"}, nil, NotForPrebuiltApex},
		},
		wantMerged: []ApexInfo{
		{"apex10000", FutureApiLevel, true, false, nil, []string{"bar", "foo"}, []string{"bar", "foo"}, nil, NotForPrebuiltApex},
		{"apex10000", FutureApiLevel, true, false, []string{"bar", "foo"}, []string{"bar", "foo"}, nil, NotForPrebuiltApex},
		},
		wantAliases: [][2]string{
		{"bar", "apex10000"},
		{"foo", "apex10000"},
		},
		},
		{
		name: "don't merge sdks",
		in: []ApexInfo{
		{"foo", FutureApiLevel, false, false, SdkRefs{{"baz", "1"}}, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex},
		{"bar", FutureApiLevel, false, false, SdkRefs{{"baz", "2"}}, []string{"bar"}, []string{"bar"}, nil, NotForPrebuiltApex},
		},
		wantMerged: []ApexInfo{
		{"apex10000_baz_2", FutureApiLevel, false, false, SdkRefs{{"baz", "2"}}, []string{"bar"}, []string{"bar"}, nil, NotForPrebuiltApex},
		{"apex10000_baz_1", FutureApiLevel, false, false, SdkRefs{{"baz", "1"}}, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex},
		},
		wantAliases: [][2]string{
		{"bar", "apex10000_baz_2"},
		{"foo", "apex10000_baz_1"},
		},
		},
		{
		name: "don't merge when for prebuilt_apex",
		in: []ApexInfo{
		{"foo", FutureApiLevel, false, false, nil, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex},
		{"bar", FutureApiLevel, true, false, nil, []string{"bar"}, []string{"bar"}, nil, NotForPrebuiltApex},
		{"foo", FutureApiLevel, false, false, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex},
		{"bar", FutureApiLevel, true, false, []string{"bar"}, []string{"bar"}, nil, NotForPrebuiltApex},
		// This one should not be merged in with the others because it is for
		// a prebuilt_apex.
		{"baz", FutureApiLevel, true, false, nil, []string{"baz"}, []string{"baz"}, nil, ForPrebuiltApex},
		{"baz", FutureApiLevel, true, false, []string{"baz"}, []string{"baz"}, nil, ForPrebuiltApex},
		},
		wantMerged: []ApexInfo{
		{"apex10000", FutureApiLevel, true, false, nil, []string{"bar", "foo"}, []string{"bar", "foo"}, nil, NotForPrebuiltApex},
		{"baz", FutureApiLevel, true, false, nil, []string{"baz"}, []string{"baz"}, nil, ForPrebuiltApex},
		{"apex10000", FutureApiLevel, true, false, []string{"bar", "foo"}, []string{"bar", "foo"}, nil, NotForPrebuiltApex},
		{"baz", FutureApiLevel, true, false, []string{"baz"}, []string{"baz"}, nil, ForPrebuiltApex},
		},
		wantAliases: [][2]string{
		{"bar", "apex10000"},
		@@ -120,11 +105,11 @@ func Test_mergeApexVariations(t *testing.T) {
		{
		name: "merge different UsePlatformApis but don't allow using platform api",
		in: []ApexInfo{
		{"foo", FutureApiLevel, false, false, nil, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex},
		{"bar", FutureApiLevel, false, true, nil, []string{"bar"}, []string{"bar"}, nil, NotForPrebuiltApex},
		{"foo", FutureApiLevel, false, false, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex},
		{"bar", FutureApiLevel, false, true, []string{"bar"}, []string{"bar"}, nil, NotForPrebuiltApex},
		},
		wantMerged: []ApexInfo{
		{"apex10000", FutureApiLevel, false, false, nil, []string{"bar", "foo"}, []string{"bar", "foo"}, nil, NotForPrebuiltApex},
		{"apex10000", FutureApiLevel, false, false, []string{"bar", "foo"}, []string{"bar", "foo"}, nil, NotForPrebuiltApex},
		},
		wantAliases: [][2]string{
		{"bar", "apex10000"},
		@@ -134,11 +119,11 @@ func Test_mergeApexVariations(t *testing.T) {
		{
		name: "merge same UsePlatformApis and allow using platform api",
		in: []ApexInfo{
		{"foo", FutureApiLevel, false, true, nil, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex},
		{"bar", FutureApiLevel, false, true, nil, []string{"bar"}, []string{"bar"}, nil, NotForPrebuiltApex},
		{"foo", FutureApiLevel, false, true, []string{"foo"}, []string{"foo"}, nil, NotForPrebuiltApex},
		{"bar", FutureApiLevel, false, true, []string{"bar"}, []string{"bar"}, nil, NotForPrebuiltApex},
		},
		wantMerged: []ApexInfo{
		{"apex10000", FutureApiLevel, false, true, nil, []string{"bar", "foo"}, []string{"bar", "foo"}, nil, NotForPrebuiltApex},
		{"apex10000", FutureApiLevel, false, true, []string{"bar", "foo"}, []string{"bar", "foo"}, nil, NotForPrebuiltApex},
		},
		wantAliases: [][2]string{
		{"bar", "apex10000"},

android/sdk.go

+0 −30

Original line number	Diff line number	Diff line
		@@ -23,24 +23,8 @@ import (
		"github.com/google/blueprint/proptools"
		)

		// RequiredSdks provides access to the set of SDKs required by an APEX and its contents.
		//
		// Extracted from SdkAware to make it easier to define custom subsets of the
		// SdkAware interface and improve code navigation within the IDE.
		//
		// In addition to its use in SdkAware this interface must also be implemented by
		// APEX to specify the SDKs required by that module and its contents. e.g. APEX
		// is expected to implement RequiredSdks() by reading its own properties like
		// `uses_sdks`.
		type RequiredSdks interface {
		// RequiredSdks returns the set of SDKs required by an APEX and its contents.
		RequiredSdks() SdkRefs
		}

		// sdkAwareWithoutModule is provided simply to improve code navigation with the IDE.
		type sdkAwareWithoutModule interface {
		RequiredSdks

		// SdkMemberComponentName will return the name to use for a component of this module based on the
		// base name of this module.
		//
		@@ -81,7 +65,6 @@ type sdkAwareWithoutModule interface {

		ContainingSdk() SdkRef
		MemberName() string
		BuildWithSdks(sdks SdkRefs)
		}

		// SdkAware is the interface that must be supported by any module to become a member of SDK or to be
		@@ -150,9 +133,6 @@ type sdkProperties struct {
		// The SDK that this module is a member of. nil if it is not a member of any SDK
		ContainingSdk *SdkRef `blueprint:"mutated"`

		// The list of SDK names and versions that are used to build this module
		RequiredSdks SdkRefs `blueprint:"mutated"`

		// Name of the module that this sdk member is representing
		Sdk_member_name *string
		}
		@@ -208,16 +188,6 @@ func (s *SdkBase) MemberName() string {
		return proptools.String(s.properties.Sdk_member_name)
		}

		// BuildWithSdks is used to mark that this module has to be built with the given SDK(s).
		func (s *SdkBase) BuildWithSdks(sdks SdkRefs) {
		s.properties.RequiredSdks = sdks
		}

		// RequiredSdks returns the SDK(s) that this module has to be built with
		func (s *SdkBase) RequiredSdks() SdkRefs {
		return s.properties.RequiredSdks
		}

		// InitSdkAwareModule initializes the SdkBase struct. This must be called by all modules including
		// SdkBase.
		func InitSdkAwareModule(m SdkAware) {

apex/apex.go

+0 −20

Original line number	Diff line number	Diff line
		@@ -159,12 +159,6 @@ type apexBundleProperties struct {
		// or else conflicting build rules may be created.
		Multi_install_skip_symbol_files *bool

		// List of SDKs that are used to build this APEX. A reference to an SDK should be either
		// `name#version` or `name` which is an alias for `name#current`. If left empty,
		// `platform#current` is implied. This value affects all modules included in this APEX. In
		// other words, they are also built with the SDKs specified here.
		Uses_sdks []string

		// The type of APEX to build. Controls what the APEX payload is. Either 'image', 'zip' or
		// 'both'. When set to image, contents are stored in a filesystem image inside a zip
		// container. When set to zip, contents are stored in a zip container directly. This type is
		@@ -791,19 +785,6 @@ func (a *apexBundle) DepsMutator(ctx android.BottomUpMutatorContext) {
		commonVariation := ctx.Config().AndroidCommonTarget.Variations()
		ctx.AddFarVariationDependencies(commonVariation, fsTag, a.properties.Filesystems...)
		ctx.AddFarVariationDependencies(commonVariation, compatConfigTag, a.properties.Compat_configs...)

		// Marks that this APEX (in fact all the modules in it) has to be built with the given SDKs.
		// This field currently isn't used.
		// TODO(jiyong): consider dropping this feature
		// TODO(jiyong): ensure that all apexes are with non-empty uses_sdks
		if len(a.properties.Uses_sdks) > 0 {
		sdkRefs := []android.SdkRef{}
		for _, str := range a.properties.Uses_sdks {
		parsed := android.ParseSdkRef(ctx, str, "uses_sdks")
		sdkRefs = append(sdkRefs, parsed)
		}
		a.BuildWithSdks(sdkRefs)
		}
		}

		// DepsMutator for the overridden properties.
		@@ -968,7 +949,6 @@ func (a *apexBundle) ApexInfoMutator(mctx android.TopDownMutatorContext) {
		apexInfo := android.ApexInfo{
		ApexVariationName: apexVariationName,
		MinSdkVersion: minSdkVersion,
		RequiredSdks: a.RequiredSdks(),
		Updatable: a.Updatable(),
		UsePlatformApis: a.UsePlatformApis(),
		InApexVariants: []string{apexVariationName},

sdk/cc_sdk_test.go

+0 −115

Original line number	Diff line number	Diff line
		@@ -193,114 +193,6 @@ sdk_snapshot {
		`))
		}

		func TestBasicSdkWithCc(t *testing.T) {
		result := testSdkWithCc(t, `
		sdk {
		name: "mysdk",
		native_shared_libs: ["sdkmember"],
		}

		cc_library_shared {
		name: "sdkmember",
		system_shared_libs: [],
		stl: "none",
		apex_available: ["mysdkapex"],
		}

		sdk_snapshot {
		name: "mysdk@1",
		native_shared_libs: ["sdkmember_mysdk@1"],
		}

		sdk_snapshot {
		name: "mysdk@2",
		native_shared_libs: ["sdkmember_mysdk@2"],
		}

		cc_prebuilt_library_shared {
		name: "sdkmember",
		srcs: ["libfoo.so"],
		prefer: false,
		system_shared_libs: [],
		stl: "none",
		}

		cc_prebuilt_library_shared {
		name: "sdkmember_mysdk@1",
		sdk_member_name: "sdkmember",
		srcs: ["libfoo.so"],
		system_shared_libs: [],
		stl: "none",
		// TODO: remove //apex_available:platform
		apex_available: [
		"//apex_available:platform",
		"myapex",
		],
		}

		cc_prebuilt_library_shared {
		name: "sdkmember_mysdk@2",
		sdk_member_name: "sdkmember",
		srcs: ["libfoo.so"],
		system_shared_libs: [],
		stl: "none",
		// TODO: remove //apex_available:platform
		apex_available: [
		"//apex_available:platform",
		"myapex2",
		],
		}

		cc_library_shared {
		name: "mycpplib",
		srcs: ["Test.cpp"],
		shared_libs: ["sdkmember"],
		system_shared_libs: [],
		stl: "none",
		apex_available: [
		"myapex",
		"myapex2",
		],
		}

		apex {
		name: "myapex",
		native_shared_libs: ["mycpplib"],
		uses_sdks: ["mysdk@1"],
		key: "myapex.key",
		certificate: ":myapex.cert",
		updatable: false,
		}

		apex {
		name: "myapex2",
		native_shared_libs: ["mycpplib"],
		uses_sdks: ["mysdk@2"],
		key: "myapex.key",
		certificate: ":myapex.cert",
		updatable: false,
		}

		apex {
		name: "mysdkapex",
		native_shared_libs: ["sdkmember"],
		key: "myapex.key",
		certificate: ":myapex.cert",
		updatable: false,
		}
		`)

		sdkMemberV1 := result.ModuleForTests("sdkmember_mysdk@1", "android_arm64_armv8-a_shared_apex10000_mysdk_1").Rule("toc").Output
		sdkMemberV2 := result.ModuleForTests("sdkmember_mysdk@2", "android_arm64_armv8-a_shared_apex10000_mysdk_2").Rule("toc").Output

		cpplibForMyApex := result.ModuleForTests("mycpplib", "android_arm64_armv8-a_shared_apex10000_mysdk_1")
		cpplibForMyApex2 := result.ModuleForTests("mycpplib", "android_arm64_armv8-a_shared_apex10000_mysdk_2")

		// Depending on the uses_sdks value, different libs are linked
		ensureListContains(t, pathsToStrings(cpplibForMyApex.Rule("ld").Implicits), sdkMemberV1.String())
		ensureListContains(t, pathsToStrings(cpplibForMyApex2.Rule("ld").Implicits), sdkMemberV2.String())
		}

		// Make sure the sdk can use host specific cc libraries static/shared and both.
		func TestHostSdkWithCc(t *testing.T) {
		testSdkWithCc(t, `
		@@ -2835,11 +2727,6 @@ func TestNoSanitizerMembers(t *testing.T) {
		}
		`)

		// Mixing the snapshot with the source (irrespective of which one is preferred) causes a problem
		// due to missing variants.
		// TODO(b/183204176): Remove this and fix the cause.
		snapshotWithSourceErrorHandler := android.FixtureExpectsAtLeastOneErrorMatchingPattern(`\QReplaceDependencies could not find identical variant {os:android,image:,arch:arm64_armv8-a,sdk:,link:shared,version:} for module mynativelib\E`)

		CheckSnapshot(t, result, "mysdk", "",
		checkUnversionedAndroidBpContents(`
		// This is auto-generated. DO NOT EDIT.
		@@ -2866,7 +2753,5 @@ myinclude/Test.h -> include/myinclude/Test.h
		arm64/include/Arm64Test.h -> arm64/include/arm64/include/Arm64Test.h
		.intermediates/mynativelib/android_arm_armv7-a-neon_shared/mynativelib.so -> arm/lib/mynativelib.so
		`),
		snapshotTestErrorHandler(checkSnapshotWithSourcePreferred, snapshotWithSourceErrorHandler),
		snapshotTestErrorHandler(checkSnapshotPreferredWithSource, snapshotWithSourceErrorHandler),
		)
		}