StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert the build flag RELEASE_EXPORT_RUNTIME_APIS to a product variable am: 35349466cd

Browse Source 
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:
Jihoon Kang
2024-02-23 02:36:45 +00:00
committed by Automerger Merge Worker
parent 14c69449f3 35349466cd
commit d881124481
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/config.go
View File

@@ -213,7 +213,7 @@ func (c Config) ReleaseDefaultModuleBuildFromSource() bool {
// Enables flagged apis annotated with READ_WRITE aconfig flags to be included in the stubs // 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 // and hiddenapi flags so that they are accessible at runtime
func (c Config) ReleaseExportRuntimeApis() bool { 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 // Enables ABI monitoring of NDK libraries

2
android/variable.go
View File

@@ -498,6 +498,8 @@ type ProductVariables struct {
BuildIgnoreApexContributionContents []string `json:",omitempty"` BuildIgnoreApexContributionContents []string `json:",omitempty"`
HiddenapiExportableStubs *bool `json:",omitempty"` HiddenapiExportableStubs *bool `json:",omitempty"`
ExportRuntimeApis *bool `json:",omitempty"`
} }
type PartitionQualifiedVariablesType struct { type PartitionQualifiedVariablesType struct {

4
java/droidstubs_test.go
View File

@@ -22,6 +22,8 @@ import (
"testing" "testing"
"android/soong/android" "android/soong/android"
"github.com/google/blueprint/proptools"
) )
func TestDroidstubs(t *testing.T) { func TestDroidstubs(t *testing.T) {
@@ -419,8 +421,8 @@ func TestReleaseExportRuntimeApis(t *testing.T) {
android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) { android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) {
variables.BuildFlags = map[string]string{ variables.BuildFlags = map[string]string{
"RELEASE_HIDDEN_API_EXPORTABLE_STUBS": "true", "RELEASE_HIDDEN_API_EXPORTABLE_STUBS": "true",
"RELEASE_EXPORT_RUNTIME_APIS": "true",
} }
variables.ExportRuntimeApis = proptools.BoolPtr(true)
}), }),
android.FixtureMergeMockFs(map[string][]byte{ android.FixtureMergeMockFs(map[string][]byte{
"a/A.java": nil, "a/A.java": nil,