diff options
| author | Vic Yang <victoryang@google.com> | 2018-11-12 20:19:56 -0800 |
|---|---|---|
| committer | Vic Yang <victoryang@google.com> | 2019-03-21 04:29:24 +0000 |
| commit | efd249e62a873bbaab0ca367710f4bbc47220930 (patch) | |
| tree | 6f50e1a308afe229391ccaa2fb1443ba05dba517 /android | |
| parent | f8d3be9cb7bd0716b606de0ded79a0264ba02bfb (diff) | |
| download | soong-efd249e62a873bbaab0ca367710f4bbc47220930.tar.gz | |
Add support for no-vendor-variant VNDK
When no-vendor-variant VNDK is enabled, the vendor variant of VNDK
libraries are not installed. Since not all VNDK libraries will be
ready for this, we keep a list of library names in cc/vndk.go to
indicate which libraries must have their vendor variants always
installed regardless of whether no-vendor-variant VNDK is enabled.
Also add --remove-build-id option to the strip script to facilitate
the check of functional identity of the two variants.
Bug: 119423884
Test: Add a dummy VNDK library and build with
TARGET_VNDK_USE_CORE_VARIANT := true, with the corresponding
build/make change.
Change-Id: Ieb1589488690e1cef1e310669a8b47a8b8759dac
Diffstat (limited to 'android')
| -rw-r--r-- | android/config.go | 4 | ||||
| -rw-r--r-- | android/variable.go | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/android/config.go b/android/config.go index 152073969..7679f2970 100644 --- a/android/config.go +++ b/android/config.go @@ -818,6 +818,10 @@ func (c *deviceConfig) ExtraVndkVersions() []string { return c.config.productVariables.ExtraVndkVersions } +func (c *deviceConfig) VndkUseCoreVariant() bool { + return Bool(c.config.productVariables.VndkUseCoreVariant) +} + func (c *deviceConfig) SystemSdkVersions() []string { return c.config.productVariables.DeviceSystemSdkVersions } diff --git a/android/variable.go b/android/variable.go index 1c17e5aec..1b33f990a 100644 --- a/android/variable.go +++ b/android/variable.go @@ -253,6 +253,8 @@ type productVariables struct { PgoAdditionalProfileDirs []string `json:",omitempty"` + VndkUseCoreVariant *bool `json:",omitempty"` + BoardVendorSepolicyDirs []string `json:",omitempty"` BoardOdmSepolicyDirs []string `json:",omitempty"` BoardPlatPublicSepolicyDirs []string `json:",omitempty"` |