rust: Hook up InstallIn functions + Product
InstallIn functions must be hooked up not only to install to special images, but also to receive special handling by android/arch.go such that some images are implicitly multilib: first. Also hook up more product details. Bug: 178565008 Bug: 165791368 Test: lunch aosp_arm64; m Change-Id: I1980d5aa9d55f78c222b98d60a404cd6ea5abbfb
This commit is contained in:
@@ -397,8 +397,15 @@ func (compiler *baseCompiler) installDir(ctx ModuleContext) android.InstallPath
|
||||
}
|
||||
|
||||
if compiler.location == InstallInData && ctx.RustModule().UseVndk() {
|
||||
dir = filepath.Join(dir, "vendor")
|
||||
if ctx.RustModule().InProduct() {
|
||||
dir = filepath.Join(dir, "product")
|
||||
} else if ctx.RustModule().InVendor() {
|
||||
dir = filepath.Join(dir, "vendor")
|
||||
} else {
|
||||
ctx.ModuleErrorf("Unknown data+VNDK installation kind")
|
||||
}
|
||||
}
|
||||
|
||||
return android.PathForModuleInstall(ctx, dir, compiler.subDir,
|
||||
compiler.relativeInstallPath(), compiler.relative)
|
||||
}
|
||||
|
Reference in New Issue
Block a user