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

Commit 4aa82a13 authored by Maxim Siniavine's avatar Maxim Siniavine Committed by Gerrit Code Review
Browse files

Merge changes from topic "revert-2755310-HIIDCMFNIU" into main 

* changes:
  Revert "Add soong config variable Release_expose_flagged_api"
  Revert "Add flagged api hide conditional to droidstubs"
parents f51ed265 5548bf30

android/config.go

+0 −8
Original line number Diff line number Diff line
@@ -2084,11 +2084,3 @@ func (c *deviceConfig) CheckVendorSeappViolations() bool { 
func (c *deviceConfig) NextReleaseHideFlaggedApi() bool {

	return Bool(c.config.productVariables.NextReleaseHideFlaggedApi)

}
 


func (c *deviceConfig) ReleaseExposeFlaggedApi() bool {

	return Bool(c.config.productVariables.ReleaseExposeFlaggedApi)

}



func (c *deviceConfig) HideFlaggedApis() bool {

	return c.NextReleaseHideFlaggedApi() && !c.ReleaseExposeFlaggedApi()

}

android/variable.go

+0 −2
Original line number Diff line number Diff line
@@ -490,8 +490,6 @@ type ProductVariables struct { 
	PartitionVarsForBazelMigrationOnlyDoNotUse PartitionVariables `json:",omitempty"`



	NextReleaseHideFlaggedApi *bool `json:",omitempty"`



	ReleaseExposeFlaggedApi *bool `json:",omitempty"`

}



type PartitionVariables struct {

java/droidstubs.go

+0 −4
Original line number Diff line number Diff line
@@ -540,10 +540,6 @@ func metalavaCmd(ctx android.ModuleContext, rule *android.RuleBuilder, javaVersi 
	// See b/285312164 for more information.

	cmd.FlagWithArg("--format-defaults ", "overloaded-method-order=source")



	if ctx.DeviceConfig().HideFlaggedApis() {

		cmd.FlagWithArg("--hide-annotation ", "android.annotation.FlaggedApi")

	}



	return cmd

}

java/droidstubs_test.go

+0 −34
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ import ( 
	"testing"



	"android/soong/android"



	"github.com/google/blueprint/proptools"

)



func TestDroidstubs(t *testing.T) {
@@ -405,35 +403,3 @@ func TestGeneratedApiContributionVisibilityTest(t *testing.T) { 


	ctx.ModuleForTests("bar", "android_common")

}
 


func TestDroidstubsHideFlaggedApi(t *testing.T) {

	result := android.GroupFixturePreparers(

		prepareForJavaTest,

		android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) {

			variables.NextReleaseHideFlaggedApi = proptools.BoolPtr(true)

			variables.ReleaseExposeFlaggedApi = proptools.BoolPtr(false)

		}),

		android.FixtureMergeMockFs(map[string][]byte{

			"a/A.java":      nil,

			"a/current.txt": nil,

			"a/removed.txt": nil,

		}),

	).RunTestWithBp(t, `

	droidstubs {

		name: "foo",

		srcs: ["a/A.java"],

		api_surface: "public",

		check_api: {

			current: {

				api_file: "a/current.txt",

				removed_api_file: "a/removed.txt",

			}

		},

	}

	`)



	m := result.ModuleForTests("foo", "android_common")

	manifest := m.Output("metalava.sbox.textproto")

	cmdline := String(android.RuleBuilderSboxProtoForTests(t, manifest).Commands[0].Command)

	android.AssertStringDoesContain(t, "flagged api hide command not included", cmdline, "--hide-annotation android.annotation.FlaggedApi")

}