Convert the build flag RELEASE_EXPORT_RUNTIME_APIS to a product variable am: 35349466cd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2973435 Change-Id: If699df9c820f06564446c5fac15ad79e2bb9365f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -213,7 +213,7 @@ func (c Config) ReleaseDefaultModuleBuildFromSource() bool {
|
||||
// Enables flagged apis annotated with READ_WRITE aconfig flags to be included in the stubs
|
||||
// and hiddenapi flags so that they are accessible at runtime
|
||||
func (c Config) ReleaseExportRuntimeApis() bool {
|
||||
return c.config.productVariables.GetBuildFlagBool("RELEASE_EXPORT_RUNTIME_APIS")
|
||||
return Bool(c.config.productVariables.ExportRuntimeApis)
|
||||
}
|
||||
|
||||
// Enables ABI monitoring of NDK libraries
|
||||
|
@@ -498,6 +498,8 @@ type ProductVariables struct {
|
||||
BuildIgnoreApexContributionContents []string `json:",omitempty"`
|
||||
|
||||
HiddenapiExportableStubs *bool `json:",omitempty"`
|
||||
|
||||
ExportRuntimeApis *bool `json:",omitempty"`
|
||||
}
|
||||
|
||||
type PartitionQualifiedVariablesType struct {
|
||||
|
@@ -22,6 +22,8 @@ import (
|
||||
"testing"
|
||||
|
||||
"android/soong/android"
|
||||
|
||||
"github.com/google/blueprint/proptools"
|
||||
)
|
||||
|
||||
func TestDroidstubs(t *testing.T) {
|
||||
@@ -419,8 +421,8 @@ func TestReleaseExportRuntimeApis(t *testing.T) {
|
||||
android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) {
|
||||
variables.BuildFlags = map[string]string{
|
||||
"RELEASE_HIDDEN_API_EXPORTABLE_STUBS": "true",
|
||||
"RELEASE_EXPORT_RUNTIME_APIS": "true",
|
||||
}
|
||||
variables.ExportRuntimeApis = proptools.BoolPtr(true)
|
||||
}),
|
||||
android.FixtureMergeMockFs(map[string][]byte{
|
||||
"a/A.java": nil,
|
||||
|
Reference in New Issue
Block a user