From e623c58cc645eeb7e8d4dca102c96204a8573c22 Mon Sep 17 00:00:00 2001
From: Kiyoung Kim <kiyoungkim@google.com>
Date: Thu, 6 Jul 2023 16:43:44 +0900
Subject: [PATCH] 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
---
 android/config.go   | 4 ++++
 android/variable.go | 2 ++
 cc/library.go       | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/android/config.go b/android/config.go
index fa439625d..8b573ec74 100644
--- a/android/config.go
+++ b/android/config.go
@@ -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] {
diff --git a/android/variable.go b/android/variable.go
index 3bec854ea..82a330abf 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -474,6 +474,8 @@ type productVariables struct {
 
 	ReleaseVersion          string   `json:",omitempty"`
 	ReleaseAconfigValueSets []string `json:",omitempty"`
+
+	KeepVndk *bool `json:",omitempty"`
 }
 
 func boolPtr(v bool) *bool {
diff --git a/cc/library.go b/cc/library.go
index aec6433d8..db83d22e5 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -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() {