diff options
author | Dan Willemsen <dwillemsen@google.com> | 2016-10-21 09:06:49 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-10-21 09:06:49 +0000 |
commit | 2ae2ac713b7d1024d6bacbf204e682eb208c0a6b (patch) | |
tree | 4771dd6ac654bde57b50bec41a959d2a0afa8555 | |
parent | 7dda54cd2bf12fb79dd9c44265757008fb816a90 (diff) | |
parent | dd026a6d01375d1abebc7f5b2e69912515b52cd2 (diff) | |
download | kati-2ae2ac713b7d1024d6bacbf204e682eb208c0a6b.tar.gz |
Merge remote-tracking branch 'aosp/upstream' into master am: 7e2a7c776b
am: dd026a6d01
Change-Id: Ib2a64949e1f735b3c707cbd5781718b34d1e3384
-rw-r--r-- | Android.bp | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -73,7 +73,7 @@ cc_binary_host { name: "ckati_stamp_dump", defaults: ["ckati_defaults"], srcs: ["regen_dump.cc"], - whole_static_libs: ["libckati"], + static_libs: ["libckati"], } cc_test_host { @@ -88,7 +88,7 @@ cc_test_host { "strutil_test.cc", ], gtest: false, - whole_static_libs: ["libckati"], + static_libs: ["libckati"], } cc_benchmark_host { @@ -97,5 +97,5 @@ cc_benchmark_host { srcs: [ "fileutil_bench.cc", ], - whole_static_libs: ["libckati"], + static_libs: ["libckati"], } |