StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Sandbox inputs to aidl rule in cc" am: cd4e6a609e am: 713bbad7bd am: edc81c3ebc am: e605dc7081 am: 12b219771a am: bb2adbfa73

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2592446

Change-Id: I25eb772d3f73d182eed65e09701f503733b75a6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-24 04:17:18 +00:00
committed by Automerger Merge Worker
parent c7f2295553 bb2adbfa73
commit 7d6c9a6ded
7 changed files with 188 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
android/config.go
View File

@@ -759,6 +759,14 @@ func (c *config) HostJavaToolPath(ctx PathContext, tool string) Path {
return path
}
func (c *config) HostCcSharedLibPath(ctx PathContext, lib string) Path {
libDir := "lib"
if ctx.Config().BuildArch.Multilib == "lib64" {
libDir = "lib64"
}
return pathForInstall(ctx, ctx.Config().BuildOS, ctx.Config().BuildArch, libDir, false, lib+".so")
}
// PrebuiltOS returns the name of the host OS used in prebuilts directories.
func (c *config) PrebuiltOS() string {
switch runtime.GOOS {