summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmin Hassani <ahassani@google.com>2019-01-02 12:29:49 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-01-02 12:29:49 -0800
commitb64bb6a292f7096581006e0df3f20f1b044f5168 (patch)
tree1cb008bc3a7470c0da906443780db30826f8e8ed
parentf2b9f9bd7a5b7397d1e493c14e0b12a30a8c677c (diff)
parent6bf987b1654a9f398f98f9553f751296d1ab8eda (diff)
downloadbsdiff-b64bb6a292f7096581006e0df3f20f1b044f5168.tar.gz
Merge "Fix the BUILD.gn to conform with recent changes in platform2"
am: 6bf987b165 Change-Id: I28d64f1d00f8fdde964e83b95cfceeb96062dbb6
-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",