commit 5069baeb659f12d81551e39052e79e6360f1259c
author android-build-team Robot <android-build-team-robot@google.com> Thu Jan 03 04:08:41 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Jan 03 04:08:41 2019 +0000
tree 1cb008bc3a7470c0da906443780db30826f8e8ed
parent 3c8606af59b0cedea324ba8f997a268a0d67ff2d
parent 6b38426359f0572382e3a392888e553a3138cc06

Snap for 5206983 from 6b38426359f0572382e3a392888e553a3138cc06 to qt-release

Change-Id: I209972b33ac2b9337a1e5954e19d2e07a20255b7

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index a65dbda..754875a 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -29,8 +29,7 @@
   }
 }
 
-pkg_config("target_defaults") {
-  pkg_deps = []
+config("target_defaults") {
   cflags = [
     "-Wextra",
     "-Wno-unused-parameter",
@@ -43,7 +42,7 @@
       # "bsdiff/...".
       "${platform2_root}/../aosp/external",
   ]
-  libs = [ "-lbz2" ]
+  libs = [ "bz2" ]
 }
 
 pkg_config("libbspatch_config") {
@@ -122,14 +121,10 @@
 }
 
 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",