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

Commit 71c86834 authored by Jihoon Kang's avatar Jihoon Kang
Browse files

Create java_api_contribution_import from sdk_library_import 

This change modifies sdk_library_import so that it directly creates
java_api_contribution per api scope. The module creates api_contribution
module for api scopes where the api file is specified.

Test: m nothing && MODULE_BUILD_FROM_SOURCE=false m nothing
--build-from-text-stub and inspect ninja dependency of java_api_library
Bug: 300175323

Change-Id: I74be3b4f1efef7f7d1cb8bd7b6c893b9cef0f370
parent 8fe1982e

java/sdk_library.go

+23 −0
Original line number Diff line number Diff line
@@ -2479,6 +2479,10 @@ func (module *SdkLibraryImport) createInternalModules(mctx android.DefaultableHo 
		if len(scopeProperties.Stub_srcs) > 0 {

			module.createPrebuiltStubsSources(mctx, apiScope, scopeProperties)

		}



		if scopeProperties.Current_api != nil {

			module.createPrebuiltApiContribution(mctx, apiScope, scopeProperties)

		}

	}



	javaSdkLibraries := javaSdkLibraries(mctx.Config())
@@ -2534,6 +2538,25 @@ func (module *SdkLibraryImport) createPrebuiltStubsSources(mctx android.Defaulta 
	mctx.CreateModule(PrebuiltStubsSourcesFactory, &props)

}



func (module *SdkLibraryImport) createPrebuiltApiContribution(mctx android.DefaultableHookContext, apiScope *apiScope, scopeProperties *sdkLibraryScopeProperties) {

	api_file := scopeProperties.Current_api

	api_surface := &apiScope.name



	props := struct {

		Name        *string

		Api_surface *string

		Api_file    *string

		Visibility  []string

	}{}



	props.Name = proptools.StringPtr(module.stubsSourceModuleName(apiScope) + ".api.contribution")

	props.Api_surface = api_surface

	props.Api_file = api_file

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



	mctx.CreateModule(ApiContributionImportFactory, &props)

}



// Add the dependencies on the child module in the component deps mutator so that it

// creates references to the prebuilt and not the source modules.

func (module *SdkLibraryImport) ComponentDepsMutator(ctx android.BottomUpMutatorContext) {

java/sdk_library_test.go

+5 −0
Original line number Diff line number Diff line
@@ -74,6 +74,8 @@ func TestJavaSdkLibrary(t *testing.T) { 
		    name: "quuz",

				public: {

					jars: ["c.jar"],

					current_api: "api/current.txt",

					removed_api: "api/removed.txt",

				},

		}

		java_sdk_library_import {
@@ -173,6 +175,9 @@ func TestJavaSdkLibrary(t *testing.T) { 
		android.AssertDeepEquals(t, "qux exports (optional)", []string{}, optionalSdkLibs)

	}



	// test if quuz have created the api_contribution module

	result.ModuleForTests(apiScopePublic.stubsSourceModuleName("quuz")+".api.contribution", "")



	fooDexJar := result.ModuleForTests("foo", "android_common").Rule("d8")

	// tests if kotlinc generated files are NOT excluded from output of foo.

	android.AssertStringDoesNotContain(t, "foo dex", fooDexJar.BuildParams.Args["mergeZipsFlags"], "-stripFile META-INF/*.kotlin_module")