diff options
| author | dimitry <dimitry@google.com> | 2019-07-11 10:23:53 +0200 |
|---|---|---|
| committer | dimitry <dimitry@google.com> | 2019-07-15 20:04:07 +0200 |
| commit | 8d6dde8831c649585cbcbfcebeea3d6a0fdcf9bd (patch) | |
| tree | c19d4f8d14d1d74de4325a965d95cd0c63b1e488 /android/androidmk.go | |
| parent | ae1131863338f8b5d9d0f58eab302514b6f78654 (diff) | |
| download | build_soong-8d6dde8831c649585cbcbfcebeea3d6a0fdcf9bd.tar.gz build_soong-8d6dde8831c649585cbcbfcebeea3d6a0fdcf9bd.tar.bz2 build_soong-8d6dde8831c649585cbcbfcebeea3d6a0fdcf9bd.zip | |
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/androidmk.go')
| -rw-r--r-- | android/androidmk.go | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/android/androidmk.go b/android/androidmk.go index 9bc26922..5b677dd9 100644 --- a/android/androidmk.go +++ b/android/androidmk.go @@ -191,15 +191,7 @@ func (a *AndroidMkEntries) fillInEntries(config Config, bpPath string, mod bluep // Make cannot identify LOCAL_MODULE_TARGET_ARCH:= common. if archStr != "common" { if amod.Target().NativeBridge { - // TODO: Unhardcode these rules. - guestArchStr := archStr - hostArchStr := "" - if guestArchStr == "arm" { - hostArchStr = "x86" - } else if guestArchStr == "arm64" { - hostArchStr = "x86_64" - } - + hostArchStr := amod.Target().NativeBridgeHostArchName if hostArchStr != "" { a.SetString("LOCAL_MODULE_TARGET_ARCH", hostArchStr) } |