Generate VNDK snapshot with Soong except configs

This is the first commit to generate VNDK snapshot with Soong: .so
files, some txt files, and notice files are captured with Soong. As
ld.config.txt is currently in Android.mk and will be deprecated soon,
configs files (and zipping all of artifacts) are still handled with
Makefile.

Bug: 131564934
Test: 1) DIST_DIR=out/dist development/vndk/snapshot/build.sh
Test: 2) try installing vndk snapshot with:
     development/vndk/snapshot/update.py

Change-Id: I8629e1e25bfc461fd495565bb4872c9af176cf92

3 files changed, 51 insertions, 0 deletions

diff --git a/android/config.go b/android/config.go
index 15e2ad4c..a18feb6d 100644
--- a/android/config.go
+++ b/android/config.go
@@ -288,6 +288,10 @@ func TestArchConfig(buildDir string, env map[string]string) Config {
 
         config.BuildOsVariant = config.Targets[BuildOs][0].String()
         config.BuildOsCommonVariant = getCommonTargets(config.Targets[BuildOs])[0].String()
+        config.TestProductVariables.DeviceArch = proptools.StringPtr("arm64")
+        config.TestProductVariables.DeviceArchVariant = proptools.StringPtr("armv8-a")
+        config.TestProductVariables.DeviceSecondaryArch = proptools.StringPtr("arm")
+        config.TestProductVariables.DeviceSecondaryArchVariant = proptools.StringPtr("armv7-a-neon")
 
         return testConfig
 }
@@ -1100,3 +1104,23 @@ func (c *config) ProductPrivateSepolicyDirs() []string {
 func (c *config) ProductCompatibleProperty() bool {
         return Bool(c.productVariables.ProductCompatibleProperty)
 }
+
+func (c *deviceConfig) BoardVndkRuntimeDisable() bool {
+        return Bool(c.config.productVariables.BoardVndkRuntimeDisable)
+}
+
+func (c *deviceConfig) DeviceArch() string {
+        return String(c.config.productVariables.DeviceArch)
+}
+
+func (c *deviceConfig) DeviceArchVariant() string {
+        return String(c.config.productVariables.DeviceArchVariant)
+}
+
+func (c *deviceConfig) DeviceSecondaryArch() string {
+        return String(c.config.productVariables.DeviceSecondaryArch)
+}
+
+func (c *deviceConfig) DeviceSecondaryArchVariant() string {
+        return String(c.config.productVariables.DeviceSecondaryArchVariant)
+}
diff --git a/android/util.go b/android/util.go
index f9dce6fe..f7a3437c 100644
--- a/android/util.go
+++ b/android/util.go
@@ -52,6 +52,31 @@ func JoinWithPrefix(strs []string, prefix string) string {
         return string(ret)
 }
 
+func JoinWithSuffix(strs []string, suffix string, separator string) string {
+        if len(strs) == 0 {
+                return ""
+        }
+
+        if len(strs) == 1 {
+                return strs[0] + suffix
+        }
+
+        n := len(" ") * (len(strs) - 1)
+        for _, s := range strs {
+                n += len(suffix) + len(s)
+        }
+
+        ret := make([]byte, 0, n)
+        for i, s := range strs {
+                if i != 0 {
+                        ret = append(ret, separator...)
+                }
+                ret = append(ret, s...)
+                ret = append(ret, suffix...)
+        }
+        return string(ret)
+}
+
 func sortedKeys(m map[string][]string) []string {
         s := make([]string, 0, len(m))
         for k := range m {
diff --git a/android/variable.go b/android/variable.go
index c5006716..ff3ebaf0 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -279,6 +279,8 @@ type productVariables struct {
         BoardPlatPrivateSepolicyDirs []string `json:",omitempty"`
         BoardSepolicyM4Defs          []string `json:",omitempty"`
 
+        BoardVndkRuntimeDisable *bool `json:",omitempty"`
+
         VendorVars map[string]map[string]string `json:",omitempty"`
 
         Ndk_abis               *bool `json:",omitempty"`