Merge "Separate hidden API flag info for sdk from platform_bootclasspath" (4f1128be) · Commits · e / os / android_build_soong

java/bootclasspath_fragment.go

+9 −1

Original line number	Diff line number	Diff line
		@@ -888,6 +888,14 @@ func (b *BootclasspathFragmentModule) produceHiddenAPIOutput(ctx android.ModuleC
		EncodedBootDexFilesByModule: encodedBootDexFilesByModule,
		}

		flagFilesByCategory := input.FlagFilesByCategory

		// Make the information available for the sdk snapshot.
		ctx.SetProvider(HiddenAPIInfoForSdkProvider, HiddenAPIInfoForSdk{
		FlagFilesByCategory: flagFilesByCategory,
		HiddenAPIFlagOutput: flagOutput,
		})

		return output
		}

		@@ -1052,7 +1060,7 @@ func (b *bootclasspathFragmentSdkMemberProperties) PopulateFromVariant(ctx andro

		// Get the hidden API information from the module.
		mctx := ctx.SdkModuleContext()
		hiddenAPIInfo := mctx.OtherModuleProvider(module, HiddenAPIInfoProvider).(HiddenAPIInfo)
		hiddenAPIInfo := mctx.OtherModuleProvider(module, HiddenAPIInfoForSdkProvider).(HiddenAPIInfoForSdk)
		b.Flag_files_by_category = hiddenAPIInfo.FlagFilesByCategory

		// Copy all the generated file paths.

+17 −0

Original line number	Diff line number	Diff line
		@@ -594,6 +594,23 @@ func (i *HiddenAPIInfo) FlagSubset() SignatureCsvSubset {

		var HiddenAPIInfoProvider = blueprint.NewProvider(HiddenAPIInfo{})

		// HiddenAPIInfoForSdk contains information provided by the hidden API processing for use
		// by the sdk snapshot.
		//
		// That includes paths resolved from HiddenAPIFlagFileProperties and also generated by hidden API
		// processing.
		type HiddenAPIInfoForSdk struct {
		// FlagFilesByCategory maps from the flag file category to the paths containing information for
		// that category.
		FlagFilesByCategory FlagFilesByCategory

		// The output from the hidden API processing needs to be made available to other modules.
		HiddenAPIFlagOutput
		}

		// Provides hidden API info for the sdk snapshot.
		var HiddenAPIInfoForSdkProvider = blueprint.NewProvider(HiddenAPIInfoForSdk{})

		// ModuleStubDexJars contains the stub dex jars provided by a single module.
		//
		// It maps a *HiddenAPIScope to the path to stub dex jars appropriate for that scope. See