Install VNDK libraries into vendor or product lib with flag
Install VNDK libraries into vendor or product lib when flag 'KEEP_VNDK' is set as false from build. This flag will be used to test while deprecating VNDK step by step. Bug: 290157355 Test: build succeded with DEPRECATE_VNDK succeded Test: Cuttlefish boot succeded with sepolicy disabled Change-Id: I05b166f054113ae2775df4e310916d0ea4af3fb6
This commit is contained in:
@@ -1355,6 +1355,10 @@ func (c *config) BazelModulesForceEnabledByFlag() map[string]struct{} {
|
||||
return c.bazelForceEnabledModules
|
||||
}
|
||||
|
||||
func (c *config) IsVndkDeprecated() bool {
|
||||
return !Bool(c.productVariables.KeepVndk)
|
||||
}
|
||||
|
||||
func (c *deviceConfig) Arches() []Arch {
|
||||
var arches []Arch
|
||||
for _, target := range c.config.Targets[Android] {
|
||||
|
@@ -474,6 +474,8 @@ type productVariables struct {
|
||||
|
||||
ReleaseVersion string `json:",omitempty"`
|
||||
ReleaseAconfigValueSets []string `json:",omitempty"`
|
||||
|
||||
KeepVndk *bool `json:",omitempty"`
|
||||
}
|
||||
|
||||
func boolPtr(v bool) *bool {
|
||||
|
@@ -2271,7 +2271,7 @@ func (library *libraryDecorator) install(ctx ModuleContext, file android.Path) {
|
||||
|
||||
// do not install vndk libs
|
||||
// vndk libs are packaged into VNDK APEX
|
||||
if ctx.isVndk() && !ctx.IsVndkExt() {
|
||||
if ctx.isVndk() && !ctx.IsVndkExt() && !ctx.Config().IsVndkDeprecated() {
|
||||
return
|
||||
}
|
||||
} else if library.hasStubsVariants() && !ctx.Host() && ctx.directlyInAnyApex() {
|
||||
|
Reference in New Issue
Block a user