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

Commit 3caa3a02 authored by Paul Duffin's avatar Paul Duffin Committed by Automerger Merge Worker
Browse files

Merge "Build updatable-bcp-packages.txt from prebuilts in sdk snapshot" am: d2a23518 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1768127

Change-Id: Icfd614f4ec1ae722e742cbf98eb58a2a71d09f1d
parents fcbeaa37 d2a23518

apex/platform_bootclasspath_test.go

+1 −0
Original line number Diff line number Diff line
@@ -398,6 +398,7 @@ func TestPlatformBootclasspath_AlwaysUsePrebuiltSdks(t *testing.T) { 
			name: "foo",

			prefer: false,

			shared_library: false,

			permitted_packages: ["foo"],

			public: {

				jars: ["sdk_library/public/foo-stubs.jar"],

				stub_srcs: ["sdk_library/public/foo_stub_sources"],

java/java.go

+6 −0
Original line number Diff line number Diff line
@@ -1192,6 +1192,12 @@ type Import struct { 
	minSdkVersion android.SdkSpec

}



var _ PermittedPackagesForUpdatableBootJars = (*Import)(nil)



func (j *Import) PermittedPackagesForUpdatableBootJars() []string {

	return j.properties.Permitted_packages

}



func (j *Import) SdkVersion(ctx android.EarlyModuleContext) android.SdkSpec {

	return android.SdkSpecFrom(ctx, String(j.properties.Sdk_version))

}

java/sdk_library.go

+6 −0
Original line number Diff line number Diff line
@@ -1999,6 +1999,12 @@ func sdkLibraryImportFactory() android.Module { 
	return module

}



var _ PermittedPackagesForUpdatableBootJars = (*SdkLibraryImport)(nil)



func (module *SdkLibraryImport) PermittedPackagesForUpdatableBootJars() []string {

	return module.properties.Permitted_packages

}



func (module *SdkLibraryImport) Prebuilt() *android.Prebuilt {

	return &module.prebuilt

}

sdk/bootclasspath_fragment_sdk_test.go

+6 −0
Original line number Diff line number Diff line
@@ -513,6 +513,12 @@ sdk_snapshot { 
				out/soong/.intermediates/frameworks/base/boot/platform-bootclasspath/android_common/hiddenapi-monolithic/index-from-classes.csv

        snapshot/hiddenapi/index.csv

			`, rule)



			// Make sure that the permitted packages from the prebuilts end up in the

			// updatable-bcp-packages.txt file.

			rule = module.Output("updatable-bcp-packages.txt")

			expectedContents := `'mybootlib\nmyothersdklibrary\n'`

			android.AssertStringEquals(t, "updatable-bcp-packages.txt", expectedContents, rule.Args["content"])

		}),

		snapshotTestPreparer(checkSnapshotWithSourcePreferred, preparerForSnapshot),

		snapshotTestPreparer(checkSnapshotPreferredWithSource, preparerForSnapshot),