Snap for 6439596 from 1b9ad0911e00ef427383a47c908c1eba642e2728 to qt-aml-tzdata-releaseq_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11q_tzdata_aml_297100000android12-mainline-tzdata-releaseandroid10-mainline-tzdata-releaseandroid10-android13-mainline-tzdata-release

Change-Id: I0519ea32901c50bdad4b4840e465370677d445bb

2 files changed, 3 insertions, 9 deletions

diff --git a/Android.bp b/Android.bp
index 21d7bfa..a2023e7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,17 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-cc_library_static {
+cc_library {
     name: "libbz",
     host_supported: true,
-    vendor_available: true,
     recovery_available: true,
-    visibility: [
-        "//bootable/recovery:__subpackages__",
-        "//external/bsdiff:__subpackages__",
-        "//external/puffin:__subpackages__",
-        "//system/update_engine:__subpackages__",
-    ],
     arch: {
         arm: {
             // measurements show that the ARM version of ZLib is about x1.17 faster
@@ -58,7 +51,7 @@ cc_binary {
         "-Werror",
         "-Wno-unused-parameter",
     ],
-    static_libs: ["libbz"],
+    shared_libs: ["libbz"],
     srcs: ["bzip2.c"],
     stl: "none",
     symlinks: [
diff --git a/OWNERS b/OWNERS
index 7cbdceb..43d1bd3 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,4 +1,5 @@
 deymo@google.com
 enh@google.com
 senj@google.com
+tbao@google.com
 xunchang@google.com