commit 06884d010cc3abbd97861e696cae2c1736679168
author Treehugger Robot <treehugger-gerrit@google.com> Fri Apr 21 07:46:18 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 21 07:46:20 2017 +0000
tree 7544183e6eef17f5edd5a55c8a4e715e77e7bae9
parent 0536f43ba6b04df7c54a11820b206b6c91080e7e
parent 0043f66c2fc9697a359a80dc63543f76955cdb3f

Merge "mark libprotobuf-cpp-* as VNDK"

Android.bp

diff --git a/Android.bp b/Android.bp
index 9b747a0..b565e7d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -66,6 +66,7 @@
 cc_library {
     name: "libprotobuf-cpp-lite",
     host_supported: true,
+    vendor_available: true,
     defaults: ["libprotobuf-cpp-lite-defaults"],
 
     cflags: ["-DGOOGLE_PROTOBUF_NO_RTTI"],
@@ -82,6 +83,7 @@
 cc_library_shared {
     name: "libprotobuf-cpp-lite-rtti",
     host_supported: true,
+    vendor_available: true,
     defaults: ["libprotobuf-cpp-lite-defaults"],
 
     rtti: true,
@@ -151,13 +153,14 @@
     name: "libprotobuf-cpp-full",
     defaults: ["libprotobuf-cpp-lite-defaults"],
     host_supported: true,
+    vendor_available: true,
 
     srcs: protobuf_cc_full_src_files,
 
     cflags: ["-DGOOGLE_PROTOBUF_NO_RTTI"],
     target: {
         android: {
-            shared_libs: ["libz"],
+            shared_libs: ["libz", "liblog"],
         },
         host: {
             shared_libs: ["libz-host"],
@@ -170,13 +173,14 @@
 cc_library_shared {
     name: "libprotobuf-cpp-full-rtti",
     defaults: ["libprotobuf-cpp-lite-defaults"],
+    vendor_available: true,
 
     srcs: protobuf_cc_full_src_files,
 
     rtti: true,
     target: {
         android: {
-            shared_libs: ["libz"],
+            shared_libs: ["libz", "liblog"],
         },
         host: {
             shared_libs: ["libz-host"],