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

Commit c15b9e99 authored by Paul Duffin's avatar Paul Duffin
Browse files

bootclasspath_fragment: Add test specific module type 

This is needed to allow the behavior of the bootclasspath_fragment to
be tweaked for test fragments.

Bug: 194063708
Test: m nothing
Change-Id: Iee5c09d5b580d088ba081d95a788dbde883078ed
parent 0e3d36c5

java/bootclasspath_fragment.go

+15 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ func init() { 


func registerBootclasspathFragmentBuildComponents(ctx android.RegistrationContext) {

	ctx.RegisterModuleType("bootclasspath_fragment", bootclasspathFragmentFactory)

	ctx.RegisterModuleType("bootclasspath_fragment_test", testBootclasspathFragmentFactory)

	ctx.RegisterModuleType("prebuilt_bootclasspath_fragment", prebuiltBootclasspathFragmentFactory)

}
@@ -227,6 +228,9 @@ type BootclasspathFragmentModule struct { 
	android.SdkBase

	ClasspathFragmentBase



	// True if this fragment is for testing purposes.

	testFragment bool



	properties bootclasspathFragmentProperties



	sourceOnlyProperties SourceOnlyBootclasspathProperties
@@ -298,6 +302,12 @@ func bootclasspathFragmentFactory() android.Module { 
	return m

}



func testBootclasspathFragmentFactory() android.Module {

	m := bootclasspathFragmentFactory().(*BootclasspathFragmentModule)

	m.testFragment = true

	return m

}



// bootclasspathFragmentInitContentsFromImage will initialize the contents property from the image_name if

// necessary.

func bootclasspathFragmentInitContentsFromImage(ctx android.EarlyModuleContext, m *BootclasspathFragmentModule) {
@@ -815,6 +825,11 @@ func (b *BootclasspathFragmentModule) createHiddenAPIFlagInput(ctx android.Modul 
	return input

}



// isTestFragment returns true if the current module is a test bootclasspath_fragment.

func (b *BootclasspathFragmentModule) isTestFragment() bool {

	return b.testFragment

}



// produceHiddenAPIOutput produces the hidden API all-flags.csv file (and supporting files)

// for the fragment as well as encoding the flags in the boot dex jars.

func (b *BootclasspathFragmentModule) produceHiddenAPIOutput(ctx android.ModuleContext, contents []android.Module, input HiddenAPIFlagInput) *HiddenAPIOutput {

java/bootclasspath_fragment_test.go

+39 −0
Original line number Diff line number Diff line
@@ -278,3 +278,42 @@ func TestBootclasspathFragment_StubLibs(t *testing.T) { 


	android.AssertPathsRelativeToTopEquals(t, "widest dex stubs jar", expectedWidestPaths, info.TransitiveStubDexJarsByScope.StubDexJarsForWidestAPIScope())

}



func TestBootclasspathFragment_Test(t *testing.T) {

	result := android.GroupFixturePreparers(

		prepareForTestWithBootclasspathFragment,

		PrepareForTestWithJavaSdkLibraryFiles,

		FixtureWithLastReleaseApis("mysdklibrary"),

	).RunTestWithBp(t, `

		bootclasspath_fragment {

			name: "myfragment",

			contents: ["mysdklibrary"],

			hidden_api: {

				split_packages: [],

			},

		}



		bootclasspath_fragment_test {

			name: "a_test_fragment",

			contents: ["mysdklibrary"],

			hidden_api: {

				split_packages: [],

			},

		}





		java_sdk_library {

			name: "mysdklibrary",

			srcs: ["a.java"],

			shared_library: false,

			public: {enabled: true},

			system: {enabled: true},

		}

	`)



	fragment := result.Module("myfragment", "android_common").(*BootclasspathFragmentModule)

	android.AssertBoolEquals(t, "not a test fragment", false, fragment.isTestFragment())



	fragment = result.Module("a_test_fragment", "android_common").(*BootclasspathFragmentModule)

	android.AssertBoolEquals(t, "is a test fragment by type", true, fragment.isTestFragment())

}