From 67d53d29a6bd309eaa8eed33dd2fbfef9ebc80f3 Mon Sep 17 00:00:00 2001
From: spoloxs <112800996+spoloxs@users.noreply.github.com>
Date: Thu, 9 Nov 2023 06:26:29 +0530
Subject: [PATCH] Update Android.bp files (#895)

Remove the `prefer_rlib` flags from all `Android.bp` files.

Solves issue #371
---
 src/android/aidl/birthday_service/Android.bp | 2 --
 src/android/build-rules/library/Android.bp   | 1 -
 src/android/logging/Android.bp               | 1 -
 3 files changed, 4 deletions(-)

diff --git a/src/android/aidl/birthday_service/Android.bp b/src/android/aidl/birthday_service/Android.bp
index 1768db134e4e..8d5a13f40403 100644
--- a/src/android/aidl/birthday_service/Android.bp
+++ b/src/android/aidl/birthday_service/Android.bp
@@ -20,7 +20,6 @@ rust_binary {
         "libbinder_rs",
         "libbirthdayservice",
     ],
-    prefer_rlib: true,
 }
 // ANCHOR_END: birthday_server
 
@@ -33,6 +32,5 @@ rust_binary {
         "com.example.birthdayservice-rust",
         "libbinder_rs",
     ],
-    prefer_rlib: true,
 }
 // ANCHOR_END: birthday_client
diff --git a/src/android/build-rules/library/Android.bp b/src/android/build-rules/library/Android.bp
index 9a8ac77a286d..4364a40f35a4 100644
--- a/src/android/build-rules/library/Android.bp
+++ b/src/android/build-rules/library/Android.bp
@@ -6,7 +6,6 @@ rust_binary {
         "libgreetings",
         "libtextwrap",
     ],
-    prefer_rlib: true,
 }
 
 rust_library {
diff --git a/src/android/logging/Android.bp b/src/android/logging/Android.bp
index 2417d854bbfa..f0c36aff96a2 100644
--- a/src/android/logging/Android.bp
+++ b/src/android/logging/Android.bp
@@ -6,6 +6,5 @@ rust_binary {
         "liblog_rust",
         "liblogger",
     ],
-    prefer_rlib: true,
     host_supported: true,
 }