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

Fix config string for the generic target. am: 9d46dcf908

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

Change-Id: I7a11aae2cab98e774696a15e8fa65ba485461e13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sasha Smundak
2022-06-30 05:52:59 +00:00
committed by Automerger Merge Worker
parent 98dcee0d82 9d46dcf908
commit ab8c3df31a
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
android/bazel_handler.go
View File

@@ -949,8 +949,15 @@ func getCqueryId(key cqueryKey) string {
func getConfigString(key cqueryKey) string {
arch := key.configKey.arch
if len(arch) == 0 || arch == "common" {
// Use host platform, which is currently hardcoded to be x86_64.
arch = "x86_64"
if key.configKey.osType.Class == Device {
// For the generic Android, the expected result is "target|android", which
// corresponds to the product_variable_config named "android_target" in
// build/bazel/platforms/BUILD.bazel.
arch = "target"
} else {
// Use host platform, which is currently hardcoded to be x86_64.
arch = "x86_64"
}
}
osName := key.configKey.osType.Name
if len(osName) == 0 || osName == "common_os" || osName == "linux_glibc" {