Merge remote-tracking branch 'aosp/upstream' into master

am: 7e2a7c776b

Change-Id: I4f70289cdfb25d8d42ce0424c0473df8eea5260a

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"],
 }