summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmin Hassani <ahassani@google.com>2019-01-02 10:34:20 -0800
committerAmin Hassani <ahassani@google.com>2019-01-02 10:37:50 -0800
commit417ae71086a3561bc8e35177d0808d6f67ab9f71 (patch)
tree1cb008bc3a7470c0da906443780db30826f8e8ed
parentdf9b6528ca94730baeb24c876d9b068b241ce6b1 (diff)
downloadbsdiff-417ae71086a3561bc8e35177d0808d6f67ab9f71.tar.gz
Fix the BUILD.gn to conform with recent changes in platform2
This includes: - Properly handling empty pkg_deps - Removing -l from the name of the libraries - Removing unneeded dependency to libchrome in unittest Bug: crbug.com/916765 Test: unittests Change-Id: I12989bac5a8495bc052ed4bdb762f33ae0ef5916
-rw-r--r--BUILD.gn9
1 files changed, 2 insertions, 7 deletions
diff --git a/BUILD.gn b/BUILD.gn
index a65dbda..754875a 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -29,8 +29,7 @@ group("all") {
}
}
-pkg_config("target_defaults") {
- pkg_deps = []
+config("target_defaults") {
cflags = [
"-Wextra",
"-Wno-unused-parameter",
@@ -43,7 +42,7 @@ pkg_config("target_defaults") {
# "bsdiff/...".
"${platform2_root}/../aosp/external",
]
- libs = [ "-lbz2" ]
+ libs = [ "bz2" ]
}
pkg_config("libbspatch_config") {
@@ -122,14 +121,10 @@ executable("bsdiff") {
}
if (use.test) {
- pkg_config("bsdiff_test_config") {
- pkg_deps = [ "libchrome-${libbase_ver}" ]
- }
executable("bsdiff_test") {
configs += [
"//common-mk:test",
":target_defaults",
- ":bsdiff_test_config",
]
deps = [
"//common-mk/testrunner",