Fix debug flag ordering
art_debug_defaults needs to come first in the defaults list so that its
prepended flags come after the art_defaults flags.
-Wno-frame-larger-than= also needs to be inside a target block to match the
way the -Wframe-larger-than= flags are inserted by art.go so that they
come after.
Change-Id: I17c191ec9dcc393db1e0805cd058c768e4d09400
diff --git a/build/Android.bp b/build/Android.bp
index be7dafd..ed9f308 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -150,9 +150,19 @@
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DVIXL_DEBUG",
"-UNDEBUG",
- "-Wno-frame-larger-than=",
],
asflags: [
"-UNDEBUG",
],
+ target: {
+ // This has to be duplicated for android and host to make sure it
+ // comes after the -Wframe-larger-than warnings inserted by art.go
+ // target-specific properties
+ android: {
+ cflags: ["-Wno-frame-larger-than="],
+ },
+ host: {
+ cflags: ["-Wno-frame-larger-than="],
+ },
+ },
}