aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2016-10-20 23:55:57 -0700
committerDan Willemsen <dwillemsen@google.com>2016-10-20 23:58:03 -0700
commit7e2a7c776b73857214538760ab6aa08c6c831486 (patch)
tree4771dd6ac654bde57b50bec41a959d2a0afa8555
parentc4cebd697250841293cd915471949953d4f2aaf2 (diff)
parentba9de4bc7eb7327d1177270d0956d6cb7aaf1d9c (diff)
Merge remote-tracking branch 'aosp/upstream' into master
* aosp/upstream: Update Android.bp to shrink executables Test: mma -j Change-Id: I0b4b8daabee1d91ffdfef1945fb08b47d53a404e
-rw-r--r--Android.bp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp
index bd45daa..f95b366 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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"],
}