summaryrefslogtreecommitdiff
path: root/build/art.go
diff options
context:
space:
mode:
author Stefano Cianciulli <scianciulli@google.com> 2022-06-07 08:27:24 +0000
committer Stefano Cianciulli <scianciulli@google.com> 2022-06-08 08:33:49 +0000
commit2be604b200429433dac28ad4bf562d849cda642e (patch)
tree37d860138a48f140add2897add3f3e374a7e3e21 /build/art.go
parent13ede9cc6e51aee7984e4a53b1b53d0fba712c8a (diff)
Fix bugprone-macro-parentheses clang-tidy issues
This CL also fixes a performance-unnecessary-copy-initialization issue which was present on the master branch and prevented m tidy-art to complete successfully. Test: m tidy-art Bug: 213953102 Change-Id: I821d797be4a866d9e1546e62bafa5a8bb0ac0578
Diffstat (limited to 'build/art.go')
-rw-r--r--build/art.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/build/art.go b/build/art.go
index 79149503c5..8272335b55 100644
--- a/build/art.go
+++ b/build/art.go
@@ -132,7 +132,7 @@ func deviceFlags(ctx android.LoadHookContext) []string {
)
cflags = append(cflags, "-DART_BASE_ADDRESS="+ctx.Config().LibartImgDeviceBaseAddress())
- minDelta := ctx.Config().GetenvWithDefault("LIBART_IMG_TARGET_MIN_BASE_ADDRESS_DELTA", "-0x1000000")
+ minDelta := ctx.Config().GetenvWithDefault("LIBART_IMG_TARGET_MIN_BASE_ADDRESS_DELTA", "(-0x1000000)")
maxDelta := ctx.Config().GetenvWithDefault("LIBART_IMG_TARGET_MAX_BASE_ADDRESS_DELTA", "0x1000000")
cflags = append(cflags, "-DART_BASE_ADDRESS_MIN_DELTA="+minDelta)
cflags = append(cflags, "-DART_BASE_ADDRESS_MAX_DELTA="+maxDelta)
@@ -154,7 +154,7 @@ func hostFlags(ctx android.LoadHookContext) []string {
)
cflags = append(cflags, "-DART_BASE_ADDRESS="+ctx.Config().LibartImgHostBaseAddress())
- minDelta := ctx.Config().GetenvWithDefault("LIBART_IMG_HOST_MIN_BASE_ADDRESS_DELTA", "-0x1000000")
+ minDelta := ctx.Config().GetenvWithDefault("LIBART_IMG_HOST_MIN_BASE_ADDRESS_DELTA", "(-0x1000000)")
maxDelta := ctx.Config().GetenvWithDefault("LIBART_IMG_HOST_MAX_BASE_ADDRESS_DELTA", "0x1000000")
cflags = append(cflags, "-DART_BASE_ADDRESS_MIN_DELTA="+minDelta)
cflags = append(cflags, "-DART_BASE_ADDRESS_MAX_DELTA="+maxDelta)
@@ -165,7 +165,7 @@ func hostFlags(ctx android.LoadHookContext) []string {
}
clang_path := filepath.Join(config.ClangDefaultBase, ctx.Config().PrebuiltOS(), config.ClangDefaultVersion)
- cflags = append(cflags, "-DART_CLANG_PATH=\""+clang_path+"\"")
+ cflags = append(cflags, fmt.Sprintf("-DART_CLANG_PATH=\"%s\"", clang_path))
return cflags
}