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

Commit cc77601d authored by Martin Stjernholm's avatar Martin Stjernholm
Browse files

Do not follow SDK member dependencies for APEX payloads. 

Test: m nothing
Test: `m` with prebuilts/runtime in the manifest (along with other
  fixes)
Bug: 151303681
Change-Id: I450d476975c7ab4434228b8c4baf3af192142211
parent 58c33f07

sdk/cc_sdk_test.go

+9 −0
Original line number Diff line number Diff line
@@ -79,6 +79,8 @@ func TestBasicSdkWithCc(t *testing.T) { 
		cc_library_shared {

			name: "sdkmember",

			system_shared_libs: [],

			stl: "none",

			apex_available: ["mysdkapex"],

		}



		sdk_snapshot {
@@ -152,6 +154,13 @@ func TestBasicSdkWithCc(t *testing.T) { 
			key: "myapex.key",

			certificate: ":myapex.cert",

		}



		apex {

			name: "mysdkapex",

			native_shared_libs: ["sdkmember"],

			key: "myapex.key",

			certificate: ":myapex.cert",

		}

	`)



	sdkMemberV1 := result.ModuleForTests("sdkmember_mysdk_1", "android_arm64_armv8-a_shared_myapex").Rule("toc").Output

sdk/sdk.go

+5 −0
Original line number Diff line number Diff line
@@ -330,6 +330,11 @@ type dependencyTag struct { 
	blueprint.BaseDependencyTag

}



// Mark this tag so dependencies that use it are excluded from APEX contents.

func (t dependencyTag) ExcludeFromApexContents() {}



var _ android.ExcludeFromApexContentsTag = dependencyTag{}



// For dependencies from an in-development version of an SDK member to frozen versions of the same member

// e.g. libfoo -> libfoo.mysdk.11 and libfoo.mysdk.12

type sdkMemberVersionedDepTag struct {

sdk/testing.go

+9 −8
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ func testSdkContext(bp string, fs map[string][]byte) (*android.TestContext, andr 
		"apex_manifest.json":                           nil,

		"system/sepolicy/apex/myapex-file_contexts":    nil,

		"system/sepolicy/apex/myapex2-file_contexts":   nil,

		"system/sepolicy/apex/mysdkapex-file_contexts": nil,

		"myapex.avbpubkey":                             nil,

		"myapex.pem":                                   nil,

		"myapex.x509.pem":                              nil,