aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Collingbourne2019-05-21 18:06:09 -0500
committerPeter Collingbourne2019-05-21 18:15:29 -0500
commit49a25cbc7c0bdbfedbfcbab22c7157517352dd62 (patch)
treef8a5431f00e6a942c8170e6a0486abf077e0b07d
parent6be6c2e4c53748263222aae44e6b3ecedf885927 (diff)
downloadplatform-build-soong-49a25cbc7c0bdbfedbfcbab22c7157517352dd62.tar.gz
platform-build-soong-49a25cbc7c0bdbfedbfcbab22c7157517352dd62.tar.xz
platform-build-soong-49a25cbc7c0bdbfedbfcbab22c7157517352dd62.zip
Restore the test for bionic being in an APEX.HEADmaster
This was removed in https://android-review.googlesource.com/c/platform/build/soong/+/950885 because it appeared that bionic was always in an APEX, but apparently the ART host tests have bionic outside of an APEX. Test: art/test/testrunner/run_build_test_target.py -j50 art-linux-bionic-x64 Change-Id: I0b99462e8636da53c87f9250093689aaaf9ea695
-rw-r--r--cc/library.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/cc/library.go b/cc/library.go
index 7889cb19..3053831a 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -957,7 +957,7 @@ func (library *libraryDecorator) install(ctx ModuleContext, file android.Path) {
957 library.baseInstaller.subDir += "-" + vndkVersion 957 library.baseInstaller.subDir += "-" + vndkVersion
958 } 958 }
959 } 959 }
960 } else if len(library.Properties.Stubs.Versions) > 0 { 960 } else if len(library.Properties.Stubs.Versions) > 0 && android.DirectlyInAnyApex(ctx, ctx.ModuleName()) {
961 // Bionic libraries (e.g. libc.so) is installed to the bootstrap subdirectory. 961 // Bionic libraries (e.g. libc.so) is installed to the bootstrap subdirectory.
962 // The original path becomes a symlink to the corresponding file in the 962 // The original path becomes a symlink to the corresponding file in the
963 // runtime APEX. 963 // runtime APEX.