summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorArman Uguray <armansito@google.com>2015-05-29 14:43:20 -0700
committerArman Uguray <armansito@google.com>2015-06-01 22:14:22 +0000
commit2c494e15583364de89ab12f417c19dc2d61efea6 (patch)
treee45203c558b4cb43c298cca82c0b18cd940b3bd8 /build
parentbbb12526d4810511cb7c79e17fdf75b0884d8c3d (diff)
downloadandroid_system_bt-2c494e15583364de89ab12f417c19dc2d61efea6.tar.gz
android_system_bt-2c494e15583364de89ab12f417c19dc2d61efea6.tar.bz2
android_system_bt-2c494e15583364de89ab12f417c19dc2d61efea6.zip
gn-build: Clean up GN files
Removed unnecessary library and include flags from build files. To make the initial build outputs more similar to Android, this CL changes the usage of the GN "source_set" idiom to "static_library". This comes at a performance loss while keeping the builds similar until we get the whole stack to compile. BUG=21339022 Change-Id: I46f70b3b64b2537634a1dbb517a5168566230efb
Diffstat (limited to 'build')
-rw-r--r--build/config/BUILDCONFIG.gn8
-rw-r--r--build/toolchain/gcc/BUILD.gn6
2 files changed, 10 insertions, 4 deletions
diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
index 8a7fe2c7a..419d62fad 100644
--- a/build/config/BUILDCONFIG.gn
+++ b/build/config/BUILDCONFIG.gn
@@ -39,3 +39,11 @@ set_defaults("source_set") {
"//build:default_include_dirs",
]
}
+
+set_defaults("static_library") {
+ configs = [
+ "//build:linux",
+ "//build:gc",
+ "//build:default_include_dirs",
+ ]
+}
diff --git a/build/toolchain/gcc/BUILD.gn b/build/toolchain/gcc/BUILD.gn
index d5a4cf69b..ecf905737 100644
--- a/build/toolchain/gcc/BUILD.gn
+++ b/build/toolchain/gcc/BUILD.gn
@@ -47,8 +47,7 @@ toolchain("gcc") {
]
default_output_extension = ".a"
- # TODO(armansito): is the following needed?
- #output_prefix = "lib"
+ output_prefix = "lib"
}
tool("solink") {
@@ -71,8 +70,7 @@ toolchain("gcc") {
link_output = soname
depend_output = soname
- # TODO(armansito): is the following needed?
- #output_prefix = "lib"
+ output_prefix = "lib"
}
tool("link") {