Snap for 5631427 from 60415f61e5d5598dfae5b61cc0bce6b77377591c to qt-release

Change-Id: Ic5998482884f1aea0bcae19c7c0bb190e8956ca1

lib/Android.bp

diff --git a/lib/Android.bp b/lib/Android.bp
index 962d8bf..d5a33f6 100644
--- a/lib/Android.bp
+++ b/lib/Android.bp
@@ -12,8 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-cc_library_shared {
+cc_library {
     name: "libbcc",
+    vendor_available: true,
     host_supported: true,
     defaults: ["libbcc-defaults"],
 

tools/bcc/Android.bp

diff --git a/tools/bcc/Android.bp b/tools/bcc/Android.bp
index d26126b..5a64c4d 100644
--- a/tools/bcc/Android.bp
+++ b/tools/bcc/Android.bp
@@ -19,6 +19,31 @@
     host_supported: true,
     defaults: ["libbcc-defaults"],
 
+    shared_libs: [
+        "libbcc",
+        "libbcinfo",
+        "libLLVM_android",
+    ],
+
+    target: {
+        android: {
+            shared_libs: [
+                "liblog",
+                "libvndksupport",
+            ],
+        },
+    },
+
+    whole_static_libs: ["libbcc_binary"],
+}
+
+// libbcc_binary is used to compile vendor modules - should not be removed
+cc_library {
+    name: "libbcc_binary",
+    host_supported: true,
+    vendor_available: true,
+    defaults: ["libbcc-defaults"],
+
     srcs: ["Main.cpp"],
 
     shared_libs: [