commit 5690591c2292f877a878f61ba3347bb987d083b7
author android-build-prod (mdb) <android-build-team-robot@google.com> Tue May 21 23:14:05 2019 +0000
committer android-build-prod (mdb) <android-build-team-robot@google.com> Tue May 21 23:14:05 2019 +0000
tree 23fba2166261d07ccb9b166e265d3814e01a6c03
parent 7cc26a894c9a0c399fa78075a2d4131e1f9fe36a
parent 5e4fc7f7964e17aba05a002a6fe2ee97c3df488d

Snap for 5590969 from 5e4fc7f7964e17aba05a002a6fe2ee97c3df488d to sdk-release

Change-Id: I1ac29f4bc7b21d9e2a17a32d710c0d2cbbae76ad

Android.bp

diff --git a/Android.bp b/Android.bp
index 85480cb..e0df169 100644
--- a/Android.bp
+++ b/Android.bp
@@ -19,7 +19,7 @@
         "include",
     ],
     shared_libs: [
-        "libprotobuf-cpp-lite",
+        "libprotobuf-cpp-full",
     ],
 }
 
@@ -37,7 +37,6 @@
     ],
     shared_libs: [
         "libprotoc",
-        "libprotobuf-cpp-lite",
     ],
 }
 
@@ -55,7 +54,6 @@
     ],
     shared_libs: [
         "libprotoc",
-        "libprotobuf-cpp-lite",
     ],
 }
 

test/cpp/common/Android.bp

diff --git a/test/cpp/common/Android.bp b/test/cpp/common/Android.bp
index 079bedd..6e118ca 100644
--- a/test/cpp/common/Android.bp
+++ b/test/cpp/common/Android.bp
@@ -1,6 +1,7 @@
 cc_test {
     name: "alarm_test",
     defaults: ["grpc_defaults"],
+    test_suites: ["device-tests"],
     srcs: [
         "alarm_test.cc",
     ],