Merge "Disable hwasan frame descriptions."
diff --git a/cc/compiler.go b/cc/compiler.go
index ea64b6a..63d2ade 100644
--- a/cc/compiler.go
+++ b/cc/compiler.go
@@ -75,6 +75,10 @@
// be added to the include path using -I
Local_include_dirs []string `android:"arch_variant,variant_prepend"`
+ // Add the directory containing the Android.bp file to the list of include
+ // directories. Defaults to true.
+ Include_build_directory *bool
+
// list of generated sources to compile. These are the names of gensrcs or
// genrule modules.
Generated_sources []string `android:"arch_variant"`
@@ -288,8 +292,11 @@
flags.YasmFlags = append(flags.YasmFlags, f)
}
- flags.GlobalFlags = append(flags.GlobalFlags, "-I"+android.PathForModuleSrc(ctx).String())
- flags.YasmFlags = append(flags.YasmFlags, "-I"+android.PathForModuleSrc(ctx).String())
+ if compiler.Properties.Include_build_directory == nil ||
+ *compiler.Properties.Include_build_directory {
+ flags.GlobalFlags = append(flags.GlobalFlags, "-I"+android.PathForModuleSrc(ctx).String())
+ flags.YasmFlags = append(flags.YasmFlags, "-I"+android.PathForModuleSrc(ctx).String())
+ }
if !(ctx.useSdk() || ctx.useVndk()) || ctx.Host() {
flags.SystemIncludeFlags = append(flags.SystemIncludeFlags,
diff --git a/ui/build/paths/config.go b/ui/build/paths/config.go
index 592c2eb..9ec1ea9 100644
--- a/ui/build/paths/config.go
+++ b/ui/build/paths/config.go
@@ -129,7 +129,6 @@
"stat": Allowed,
"tar": Allowed,
"timeout": Allowed,
- "touch": Allowed,
"tr": Allowed,
"unzip": Allowed,
"wc": Allowed,
@@ -171,6 +170,7 @@
"sleep": Toybox,
"tail": Toybox,
"tee": Toybox,
+ "touch": Toybox,
"true": Toybox,
"uname": Toybox,
"uniq": Toybox,