diff options
| author | 2019-07-11 10:23:53 +0200 | |
|---|---|---|
| committer | 2019-07-15 20:04:07 +0200 | |
| commit | 8d6dde8831c649585cbcbfcebeea3d6a0fdcf9bd (patch) | |
| tree | c19d4f8d14d1d74de4325a965d95cd0c63b1e488 /android/variable.go | |
| parent | ae1131863338f8b5d9d0f58eab302514b6f78654 (diff) | |
Make relative path for native_bridge binaries configurable
This change introduces NativeBridgeRelativePath and
NativeBridgeSecondaryRelativePath product variables to
make relative path to native_bridge binaries configurable.
It also removes moves information about native bridge
host architecture to Target and sets it during decodeTargetProductVariables
Test: make PRODUCT-cf_x86_phone-userdebug dist
Change-Id: Ie736e81eae507e1775566ce9f29135011b12af27
Diffstat (limited to 'android/variable.go')
| -rw-r--r-- | android/variable.go | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/android/variable.go b/android/variable.go index fcd92d455..47586a760 100644 --- a/android/variable.go +++ b/android/variable.go @@ -165,15 +165,17 @@ type productVariables struct { DeviceSecondaryCpuVariant *string `json:",omitempty"` DeviceSecondaryAbi []string `json:",omitempty"` - NativeBridgeArch *string `json:",omitempty"` - NativeBridgeArchVariant *string `json:",omitempty"` - NativeBridgeCpuVariant *string `json:",omitempty"` - NativeBridgeAbi []string `json:",omitempty"` - - NativeBridgeSecondaryArch *string `json:",omitempty"` - NativeBridgeSecondaryArchVariant *string `json:",omitempty"` - NativeBridgeSecondaryCpuVariant *string `json:",omitempty"` - NativeBridgeSecondaryAbi []string `json:",omitempty"` + NativeBridgeArch *string `json:",omitempty"` + NativeBridgeArchVariant *string `json:",omitempty"` + NativeBridgeCpuVariant *string `json:",omitempty"` + NativeBridgeAbi []string `json:",omitempty"` + NativeBridgeRelativePath *string `json:",omitempty"` + + NativeBridgeSecondaryArch *string `json:",omitempty"` + NativeBridgeSecondaryArchVariant *string `json:",omitempty"` + NativeBridgeSecondaryCpuVariant *string `json:",omitempty"` + NativeBridgeSecondaryAbi []string `json:",omitempty"` + NativeBridgeSecondaryRelativePath *string `json:",omitempty"` HostArch *string `json:",omitempty"` HostSecondaryArch *string `json:",omitempty"` |