diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-01-02 20:12:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-01-02 20:12:02 +0000 |
| commit | 6bf987b1654a9f398f98f9553f751296d1ab8eda (patch) | |
| tree | 1cb008bc3a7470c0da906443780db30826f8e8ed | |
| parent | df9b6528ca94730baeb24c876d9b068b241ce6b1 (diff) | |
| parent | 417ae71086a3561bc8e35177d0808d6f67ab9f71 (diff) | |
| download | bsdiff-6bf987b1654a9f398f98f9553f751296d1ab8eda.tar.gz | |
Merge "Fix the BUILD.gn to conform with recent changes in platform2"android-o-mr1-iot-release-1.0.8
| -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", |