Don't use system include path for target build.
Bug: 120405260
Change-Id: I223a8ca064d450d466d01968b975e28e9dfe8e13
diff --git a/build/toolchain/embedded.gni b/build/toolchain/embedded.gni
index 3453b33..9731763 100644
--- a/build/toolchain/embedded.gni
+++ b/build/toolchain/embedded.gni
@@ -117,7 +117,14 @@
"extra_cflags",
"extra_ldflags",
])
- extra_cflags += " -target ${invoker.target} -fcolor-diagnostics"
+
+ # TODO: Remove //inc/system if we can stop using the version of stdatomic.h
+ # from the Android prebuilt Clang.
+ extra_cflags +=
+ " -target ${invoker.target} -fcolor-diagnostics -nostdinc -isystem" +
+ rebase_path("//prebuilts/linux-aarch64/musl/include") + " -isystem" +
+ rebase_path("//prebuilts/linux-x64/clang/lib64/clang/8.0.4/include") +
+ " -isystem" + rebase_path("//inc/system")
extra_ldflags +=
" -O2 -lto-O2 --icf=all --fatal-warnings --color-diagnostics"