diff options
| author | Colin Cross <ccross@android.com> | 2019-09-17 14:45:31 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-09-19 12:54:32 -0700 |
| commit | 3b19f5d71dbdbbf79a211f40ccfd39f42f2bc7ec (patch) | |
| tree | 8559295a723d8b002755fba3645e44ed620ca071 /cc/binary.go | |
| parent | 1f6c94a3ac5cc86c81a3a8e9ed5561d0e1e9c5fc (diff) | |
Remove old-style support for translated second architectures
Translated second architectures now go in NativeBridgeArch instead
of DeviceSecondaryArch.
This reapplies I568046330abc002d4eed582cb999b62a5eaba790 with
ctx.Config().HasMulitlibConflict() added to fix the NDK build,
which has arm64, arm, x86_64, and x86 architectures enabled.
Test: m checkbuild
Test: OUT_DIR=out_ndk build/soong/scripts/build-ndk-prebuilts.sh
Test: no change to build.ninja or Android-aosp_cf_x86_phone.mk
Change-Id: Iadcafbd64bfb9579ae7c86914927c43a062b0c8e
Diffstat (limited to 'cc/binary.go')
| -rw-r--r-- | cc/binary.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cc/binary.go b/cc/binary.go index 0d6940511..9f18d6c8a 100644 --- a/cc/binary.go +++ b/cc/binary.go @@ -453,7 +453,7 @@ func (binary *binaryDecorator) install(ctx ModuleContext, file android.Path) { // Bionic binaries (e.g. linker) is installed to the bootstrap subdirectory. // The original path becomes a symlink to the corresponding file in the // runtime APEX. - translatedArch := ctx.Target().NativeBridge == android.NativeBridgeEnabled || !ctx.Arch().Native + translatedArch := ctx.Target().NativeBridge == android.NativeBridgeEnabled if InstallToBootstrap(ctx.baseModuleName(), ctx.Config()) && !translatedArch && ctx.apexName() == "" && !ctx.inRecovery() { if ctx.Device() && isBionic(ctx.baseModuleName()) { binary.installSymlinkToRuntimeApex(ctx, file) |