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

Commit 82b3fcf1 authored by Paul Duffin's avatar Paul Duffin
Browse files

Remove duplicates in monolithic hidden API files 

Previously, multiple APEX variants of some boot jars were being
processed by hiddenapi to extract information which resulted in
duplicate entries in the monolithic hidden API files.

This change applies the same filter that was previously used to ensure
that the hiddenapi-flags.csv file did not include any duplicates to all
sources of hidden API information.

Bug: 180102243
Test: m droid
      Verified that hiddenapi files (both aggregated ones and for the
      individual modules) are not affected by this change other than
      removing some duplicates entries.
Change-Id: I9ffc8586d5d6efea4e3440be2dfd5424790665c8
parent f8f4af8f

java/hiddenapi.go

+11 −2
Original line number Diff line number Diff line
@@ -124,7 +124,8 @@ func (h *hiddenAPI) initHiddenAPI(ctx android.BaseModuleContext, configurationNa 
	// on the boot jars list because the runtime only enforces access to the hidden API for the

	// bootclassloader. If information is gathered for modules not on the list then that will cause

	// failures in the CtsHiddenApiBlocklist... tests.

	h.active = inList(configurationName, ctx.Config().BootJars())

	module := ctx.Module()

	h.active = isModuleInBootClassPath(ctx, module)

	if !h.active {

		// The rest of the properties will be ignored if active is false.

		return
@@ -135,7 +136,6 @@ func (h *hiddenAPI) initHiddenAPI(ctx android.BaseModuleContext, configurationNa 


	// A prebuilt module is only primary if it is preferred and conversely a source module is only

	// primary if it has not been replaced by a prebuilt module.

	module := ctx.Module()

	if pi, ok := module.(android.PrebuiltInterface); ok {

		if p := pi.Prebuilt(); p != nil {

			primary = p.UsePrebuilt()
@@ -153,6 +153,15 @@ func (h *hiddenAPI) initHiddenAPI(ctx android.BaseModuleContext, configurationNa 
	h.primary = primary

}



func isModuleInBootClassPath(ctx android.BaseModuleContext, module android.Module) bool {

	// Get the configured non-updatable and updatable boot jars.

	nonUpdatableBootJars := ctx.Config().NonUpdatableBootJars()

	updatableBootJars := ctx.Config().UpdatableBootJars()

	active := isModuleInConfiguredList(ctx, module, nonUpdatableBootJars) ||

		isModuleInConfiguredList(ctx, module, updatableBootJars)

	return active

}



// hiddenAPIExtractAndEncode is called by any module that could contribute to the hiddenapi

// processing.

//

java/hiddenapi_singleton.go

+4 −13
Original line number Diff line number Diff line
@@ -217,10 +217,6 @@ func stubFlagsRule(ctx android.SingletonContext) { 


	var bootDexJars android.Paths



	// Get the configured non-updatable and updatable boot jars.

	nonUpdatableBootJars := ctx.Config().NonUpdatableBootJars()

	updatableBootJars := ctx.Config().UpdatableBootJars()



	ctx.VisitAllModules(func(module android.Module) {

		// Collect dex jar paths for the modules listed above.

		if j, ok := module.(UsesLibraryDependency); ok {
@@ -235,11 +231,6 @@ func stubFlagsRule(ctx android.SingletonContext) { 
		// Collect dex jar paths for modules that had hiddenapi encode called on them.

		if h, ok := module.(hiddenAPIIntf); ok {

			if jar := h.bootDexJar(); jar != nil {

				if !isModuleInConfiguredList(ctx, module, nonUpdatableBootJars) &&

					!isModuleInConfiguredList(ctx, module, updatableBootJars) {

					return

				}



				bootDexJars = append(bootDexJars, jar)

			}

		}
@@ -291,8 +282,8 @@ func stubFlagsRule(ctx android.SingletonContext) { 
// there too.

//

// TODO(b/179354495): Avoid having to perform this type of check or if necessary dedup it.

func isModuleInConfiguredList(ctx android.SingletonContext, module android.Module, configuredBootJars android.ConfiguredJarList) bool {

	name := ctx.ModuleName(module)

func isModuleInConfiguredList(ctx android.BaseModuleContext, module android.Module, configuredBootJars android.ConfiguredJarList) bool {

	name := ctx.OtherModuleName(module)



	// Strip a prebuilt_ prefix so that this can match a prebuilt module that has not been renamed.

	name = android.RemoveOptionalPrebuiltPrefix(name)
@@ -305,11 +296,11 @@ func isModuleInConfiguredList(ctx android.SingletonContext, module android.Modul 


	// It is an error if the module is not an ApexModule.

	if _, ok := module.(android.ApexModule); !ok {

		ctx.Errorf("module %q configured in boot jars does not support being added to an apex", module)

		ctx.ModuleErrorf("is configured in boot jars but does not support being added to an apex")

		return false

	}



	apexInfo := ctx.ModuleProvider(module, android.ApexInfoProvider).(android.ApexInfo)

	apexInfo := ctx.OtherModuleProvider(module, android.ApexInfoProvider).(android.ApexInfo)



	// Now match the apex part of the boot image configuration.

	requiredApex := configuredBootJars.Apex(index)