diff options
| author | Jiyong Park <jiyong@google.com> | 2017-01-20 08:57:02 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2017-03-14 09:13:44 +0900 |
| commit | 4c48f724e1b339128447ab1dafd656a9557557f5 (patch) | |
| tree | fb919348ccdce51fade25cc5feb029f881cec22f /cc/installer.go | |
| parent | 300151ba19bfa79a68e25223f8864d34cf5039f6 (diff) | |
| download | android_build_soong-4c48f724e1b339128447ab1dafd656a9557557f5.tar.gz android_build_soong-4c48f724e1b339128447ab1dafd656a9557557f5.tar.bz2 android_build_soong-4c48f724e1b339128447ab1dafd656a9557557f5.zip | |
install *.so in different paths for their types
Shared libraries are now installed to different directories depending on
their types.
* NDK libraries: /system/lib/ndk
* VNDK libraries: /system/lib/vndk
* VNDK-ext libraries: /system/lib/vndk-ext
* Framework-only libraries: /system/lib
* Vendor-only libraries: /vendor/lib
* Same-process HALs: /vendor/lib/sameprocess
In addition, a new module type vndk_ext_library is added. It is almost
identical to cc_shared_library but it introduces another attribute
'extends'. This is use to reference the vndk library that this vndk-ext
library is extending.
For example, in order to extend a vndk library libFoo:
cc_library {
name: "libFoo",
srcs: [...]
}
---------------------
vndk_ext_library {
name: "libFoo-extended",
srcs: [...]
extends: "libFoo"
}
Then, libFoo will be installed as /system/lib/vndk/libFoo.so and
libFoo-extended will be installed as /system/lib/vndk-ext/libFoo.so.
Note that file name of the latter is libFoo.so, not libFoo-extended.so:
file name of an extending module is automatically set to that of the
extended module.
Bug: 33681361
Test: build & run. Libraries must be in the correct directories.
Change-Id: Ia1eb3940605d582a252c78da0f3a5b36fdab062b
Diffstat (limited to 'cc/installer.go')
| -rw-r--r-- | cc/installer.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cc/installer.go b/cc/installer.go index 64f87d96..de04ab64 100644 --- a/cc/installer.go +++ b/cc/installer.go @@ -47,6 +47,7 @@ type baseInstaller struct { dir string dir64 string + subDir string relative string location installLocation @@ -60,14 +61,14 @@ func (installer *baseInstaller) installerProps() []interface{} { } func (installer *baseInstaller) installDir(ctx ModuleContext) android.OutputPath { - subDir := installer.dir + dir := installer.dir if ctx.toolchain().Is64Bit() && installer.dir64 != "" { - subDir = installer.dir64 + dir = installer.dir64 } if !ctx.Host() && !ctx.Arch().Native { - subDir = filepath.Join(subDir, ctx.Arch().ArchType.String()) + dir = filepath.Join(dir, ctx.Arch().ArchType.String()) } - return android.PathForModuleInstall(ctx, subDir, installer.Properties.Relative_install_path, installer.relative) + return android.PathForModuleInstall(ctx, dir, installer.subDir, installer.Properties.Relative_install_path, installer.relative) } func (installer *baseInstaller) install(ctx ModuleContext, file android.Path) { |