commit 4809b64dfdc549baf827efdf077825893ea26930
author Treehugger Robot <treehugger-gerrit@google.com> Sat Apr 15 01:09:55 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Apr 15 01:09:55 2017 +0000
tree 49755c8bac1f277478ceb6aa0268c8f343af5cee
parent 9041b78e0e74a7449d11c56b9aefa1cb5b7c234f
parent f3a7a95fd481fd9aed296596fba4247ca35c0c4d

Merge "Remove libprotobuf-cpp-lite dependency."

vndk/tools/header-checker/Android.bp

diff --git a/vndk/tools/header-checker/Android.bp b/vndk/tools/header-checker/Android.bp
index 70fd232..09280dd 100644
--- a/vndk/tools/header-checker/Android.bp
+++ b/vndk/tools/header-checker/Android.bp
@@ -85,11 +85,11 @@
 
     static_libs: [
         "libLLVMSupport",
+        "libheader-abi-util",
     ],
 
     shared_libs: [
         "libprotobuf-cpp-full",
-        "libheader-abi-util",
     ],
 }
 
@@ -105,6 +105,7 @@
 
     proto: {
         export_proto_headers: true,
+        type: "full",
     },
 
     cflags: [
@@ -128,9 +129,6 @@
 
     static_libs: [
         "libheader-checker-proto",
-    ],
-
-		shared_libs: [
         "libheader-abi-util",
     ],
 
@@ -214,7 +212,7 @@
     },
 }
 
-cc_library_shared {
+cc_library_static {
     name: "libheader-abi-util",
     defaults: [
         "header-checker-defaults",