tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Revert "Disable hiddenapi check for building from prebuilts."" into main am: affbb8d206 am: 40ed4395ab

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2777308

Change-Id: Ia877e9178f877f696868222bba1e5f985a8b92d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alyssa Ketpreechasawat 2023-10-06 09:36:10 +00:00 committed by Automerger Merge Worker
commit 33eb8c5a6d
2 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
android/config.go
View file

@ -167,8 +167,7 @@ func (c Config) RunningInsideUnitTest() bool {
} }
// DisableHiddenApiChecks returns true if hiddenapi checks have been disabled. // DisableHiddenApiChecks returns true if hiddenapi checks have been disabled.
// For 'eng' target variant hiddenapi checks are disabled by default for performance optimisation // For 'eng' target variant hiddenapi checks are disabled by default for performance optimisation,
// Hiddenapi checks are also disabled when RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE is set to false
// but can be enabled by setting environment variable ENABLE_HIDDENAPI_FLAGS=true. // but can be enabled by setting environment variable ENABLE_HIDDENAPI_FLAGS=true.
// For other target variants hiddenapi check are enabled by default but can be disabled by // For other target variants hiddenapi check are enabled by default but can be disabled by
// setting environment variable UNSAFE_DISABLE_HIDDENAPI_FLAGS=true. // setting environment variable UNSAFE_DISABLE_HIDDENAPI_FLAGS=true.
@ -177,8 +176,7 @@ func (c Config) RunningInsideUnitTest() bool {
func (c Config) DisableHiddenApiChecks() bool { func (c Config) DisableHiddenApiChecks() bool {
return !c.IsEnvTrue("ENABLE_HIDDENAPI_FLAGS") && return !c.IsEnvTrue("ENABLE_HIDDENAPI_FLAGS") &&
(c.IsEnvTrue("UNSAFE_DISABLE_HIDDENAPI_FLAGS") || (c.IsEnvTrue("UNSAFE_DISABLE_HIDDENAPI_FLAGS") ||
Bool(c.productVariables.Eng) || Bool(c.productVariables.Eng))
!c.ReleaseDefaultModuleBuildFromSource())
} }
// MaxPageSizeSupported returns the max page size supported by the device. This // MaxPageSizeSupported returns the max page size supported by the device. This
@ -223,13 +221,6 @@ func (c Config) ReleaseAconfigFlagDefaultPermission() string {
return c.config.productVariables.ReleaseAconfigFlagDefaultPermission return c.config.productVariables.ReleaseAconfigFlagDefaultPermission
} }
// The flag indicating behavior for the tree wrt building modules or using prebuilts
// derived from RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE
func (c Config) ReleaseDefaultModuleBuildFromSource() bool {
return c.config.productVariables.ReleaseDefaultModuleBuildFromSource == nil ||
Bool(c.config.productVariables.ReleaseDefaultModuleBuildFromSource)
}
// A DeviceConfig object represents the configuration for a particular device // A DeviceConfig object represents the configuration for a particular device
// being built. For now there will only be one of these, but in the future there // being built. For now there will only be one of these, but in the future there
// may be multiple devices being built. // may be multiple devices being built.

2
android/variable.go
View file

@ -479,8 +479,6 @@ type ProductVariables struct {
ReleaseAconfigFlagDefaultPermission string `json:",omitempty"` ReleaseAconfigFlagDefaultPermission string `json:",omitempty"`
ReleaseDefaultModuleBuildFromSource *bool `json:",omitempty"`
KeepVndk *bool `json:",omitempty"` KeepVndk *bool `json:",omitempty"`
CheckVendorSeappViolations *bool `json:",omitempty"` CheckVendorSeappViolations *bool `json:",omitempty"`