diff options
author | Amin Hassani <ahassani@google.com> | 2019-01-02 12:36:54 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-01-02 12:36:54 -0800 |
commit | 6b38426359f0572382e3a392888e553a3138cc06 (patch) | |
tree | 1cb008bc3a7470c0da906443780db30826f8e8ed | |
parent | c53e3a0eb342712f3a9fdd871e146857888b184f (diff) | |
parent | 3803bf753a9cd5184eae5d03868012f1e43ca994 (diff) | |
download | bsdiff-6b38426359f0572382e3a392888e553a3138cc06.tar.gz |
Merge "Fix the BUILD.gn to conform with recent changes in platform2" am: 6bf987b165 am: b64bb6a292
am: 3803bf753a
Change-Id: Ie9ead86713e8a2875172bbf1af0890c737074281
-rw-r--r-- | BUILD.gn | 9 |
1 files changed, 2 insertions, 7 deletions
@@ -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", |