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

Commit 12d29b77 authored by Paul Duffin's avatar Paul Duffin
Browse files

Move generation of hidden API make vars to platform_bootclasspath 

Bug: 179354495
Test: rm out/soong/make_vars*
      m nothing
      grep INTERNAL_PLATFORM_HIDDENAPI_FLAGS out/soong/make_vars*
      - make sure it is still out/soong/hiddenapi/hiddenapi-flags.csv
Change-Id: I86e56512a9a2091f446bad25294d41ea1f4341ee
parent e3ecce67

java/hiddenapi_singleton.go

+0 −9
Original line number Diff line number Diff line
@@ -149,15 +149,6 @@ func (h *hiddenAPISingleton) GenerateBuildActions(ctx android.SingletonContext) 
	}

}



// Export paths to Make.  INTERNAL_PLATFORM_HIDDENAPI_FLAGS is used by Make rules in art/ and cts/.

func (h *hiddenAPISingleton) MakeVars(ctx android.MakeVarsContext) {

	if ctx.Config().IsEnvTrue("UNSAFE_DISABLE_HIDDENAPI_FLAGS") {

		return

	}



	ctx.Strict("INTERNAL_PLATFORM_HIDDENAPI_FLAGS", h.flags.String())

}



// Checks to see whether the supplied module variant is in the list of boot jars.

//

// This is similar to logic in getBootImageJar() so any changes needed here are likely to be needed

java/platform_bootclasspath.go

+11 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ func (b *platformBootclasspathModule) GenerateSingletonBuildActions(android.Sing 
}



func (d *platformBootclasspathModule) MakeVars(ctx android.MakeVarsContext) {

	// Placeholder for now.

	d.generateHiddenApiMakeVars(ctx)

}



func (b *platformBootclasspathModule) GenerateAndroidBuildActions(ctx android.ModuleContext) {
@@ -319,6 +319,16 @@ func (b *platformBootclasspathModule) generatedHiddenAPIMetadataRules(ctx androi 
	rule.Build("platform-bootclasspath-monolithic-hiddenapi-metadata", "monolithic hidden API metadata")

}



// generateHiddenApiMakeVars generates make variables needed by hidden API related make rules, e.g.

// veridex and run-appcompat.

func (b *platformBootclasspathModule) generateHiddenApiMakeVars(ctx android.MakeVarsContext) {

	if ctx.Config().IsEnvTrue("UNSAFE_DISABLE_HIDDENAPI_FLAGS") {

		return

	}

	// INTERNAL_PLATFORM_HIDDENAPI_FLAGS is used by Make rules in art/ and cts/.

	ctx.Strict("INTERNAL_PLATFORM_HIDDENAPI_FLAGS", b.hiddenAPIFlagsCSV.String())

}



// generateBootImageBuildActions generates ninja rules related to the boot image creation.

func (b *platformBootclasspathModule) generateBootImageBuildActions(ctx android.ModuleContext, updatableModules []android.Module) {

	// Force the GlobalSoongConfig to be created and cached for use by the dex_bootjars