diff options
| author | Martin Stjernholm <mast@google.com> | 2019-09-10 23:18:20 +0100 |
|---|---|---|
| committer | Martin Stjernholm <mast@google.com> | 2019-09-11 12:16:31 +0100 |
| commit | 279de572d79d6eaccf298facc766745ce22d9312 (patch) | |
| tree | e0ebedeffd69eeed8a9b19b05244197b70dd393d /cc/binary.go | |
| parent | 84bd071cac28b71032bea5d1f604a9b25b395bc6 (diff) | |
| download | soong-279de572d79d6eaccf298facc766745ce22d9312.tar.gz | |
Treat libclang_rt.hwasan-* the same way as the other Bionic bootstrap libs.
Ensure that it ends up in the bionic/ subdir in the Runtime APEX and is
symlinked from /system/lib(64). That makes it available in the default
(platform) linker namespace and no longer requires it to be accessible
through the runtime namespace. All this makes it consistent with how the
other Bionic libs are handled, and avoids the need for various special
cases in ld.config.txt files (to be cleaned up later).
With this there might no longer be a need for a linker namespace for the
Runtime APEX, and we could consider removing the kludge with the
/apex/com.android.runtime/${LIB}/bionic subdirectories and the special case
in getCopyManifestForNativeLibrary in apex.go. However, keeping it calls out
the special treatment of those libraries, and allows a namespace to be added
again if necessary.
Test: Build and boot on taimen_hwasan-userdebug
Test: adb shell /apex/com.android.art/bin/dexdump on taimen_hwasan-userdebug
Test: atest CtsCompilationTestCases on taimen_hwasan-userdebug
Bug: 140734238
Bug: 140790209
Change-Id: Ieb506bfa5d5c159db391273c7eba41d7909de286
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 17e729ca6..0d6940511 100644 --- a/cc/binary.go +++ b/cc/binary.go @@ -454,7 +454,7 @@ func (binary *binaryDecorator) install(ctx ModuleContext, file android.Path) { // The original path becomes a symlink to the corresponding file in the // runtime APEX. translatedArch := ctx.Target().NativeBridge == android.NativeBridgeEnabled || !ctx.Arch().Native - if installToBootstrap(ctx.baseModuleName(), ctx.Config()) && !translatedArch && ctx.apexName() == "" && !ctx.inRecovery() { + if InstallToBootstrap(ctx.baseModuleName(), ctx.Config()) && !translatedArch && ctx.apexName() == "" && !ctx.inRecovery() { if ctx.Device() && isBionic(ctx.baseModuleName()) { binary.installSymlinkToRuntimeApex(ctx, file) } |