Use libbitflags-1.3.2aml_wif_341711020aml_wif_341610000aml_wif_341510000aml_wif_341410080aml_wif_341310010aml_wif_341110010aml_wif_341011010aml_wif_340913010aml_uwb_341710010aml_uwb_341513070aml_uwb_341511050aml_uwb_341310300aml_uwb_341310030aml_uwb_341111010aml_uwb_341011000aml_tet_341712060aml_tet_341610020aml_tet_341511010aml_tet_341411060aml_tet_341310230aml_tet_341112070aml_tet_341010040aml_tet_340913030aml_swc_341711000aml_swc_341619000aml_swc_341513600aml_swc_341312300aml_swc_341312020aml_swc_341111000aml_swc_341011020aml_swc_340922010aml_sta_341710000aml_sta_341615000aml_sta_341511040aml_sta_341410000aml_sta_341311010aml_sta_341114000aml_sta_341111000aml_sta_341010020aml_sta_340912000aml_sta_340911000aml_sdk_341710000aml_sdk_341510000aml_sdk_341410000aml_sdk_341110080aml_sdk_341110000aml_sdk_341010000aml_sdk_340912010aml_sch_341510000aml_res_341510000aml_res_341410010aml_res_341311030aml_res_341110000aml_res_340912000aml_per_341711000aml_per_341614000aml_per_341510010aml_per_341410020aml_per_341311000aml_per_341110020aml_per_341110010aml_per_341011100aml_per_341011020aml_per_340916010aml_odp_341717000aml_odp_341610000aml_neu_341510000aml_neu_341010080aml_neu_341010000aml_net_341710020aml_net_341610030aml_net_341510050aml_net_341510000aml_net_341411030aml_net_341311010aml_net_341310020aml_net_341111030aml_net_341014000aml_net_340913000aml_mpr_341713020aml_mpr_341614010aml_mpr_341511070aml_mpr_341411070aml_mpr_341313030aml_mpr_341111030aml_mpr_341111020aml_mpr_341015090aml_mpr_341015030aml_mpr_340919000aml_med_341711000aml_med_341619000aml_med_341513600aml_med_341312300aml_med_341312020aml_med_341111000aml_med_341011000aml_med_340922010aml_ips_341611000aml_ips_341510000aml_ips_340914280aml_ips_340914200aml_ips_340914000aml_ext_341716000aml_ext_341620040aml_ext_341518010aml_ext_341414010aml_ext_341317010aml_ext_341131030aml_ext_341027030aml_doc_341713000aml_doc_341610010aml_doc_341510050aml_doc_341312010aml_doc_341112000aml_doc_341012000aml_doc_340916000aml_con_341614000aml_con_341511080aml_con_341410300aml_con_341310090aml_con_341110000aml_cbr_341710000aml_cbr_341610000aml_cbr_341510010aml_cbr_341410010aml_cbr_341311010aml_cbr_341110000aml_cbr_341011000aml_cbr_340914000aml_ase_341510000aml_ase_341410000aml_ase_341310010aml_ase_341113000aml_ase_340913000aml_art_341711000aml_art_341615020aml_art_341514450aml_art_341514410aml_art_341411300aml_art_341311100aml_art_341110110aml_art_341110060aml_art_341010050aml_art_340915060aml_ads_341720000aml_ads_341615050aml_ads_341517040aml_ads_341413000aml_ads_341316030aml_ads_341131050aml_ads_341027030aml_ads_340915050aml_adb_341520010aml_adb_341517070aml_adb_340912530aml_adb_340912350aml_adb_340912200aml_adb_340912000android14-mainline-wifi-releaseandroid14-mainline-uwb-releaseandroid14-mainline-tethering-releaseandroid14-mainline-sdkext-releaseandroid14-mainline-resolv-releaseandroid14-mainline-permission-releaseandroid14-mainline-os-statsd-releaseandroid14-mainline-networking-releaseandroid14-mainline-mediaprovider-releaseandroid14-mainline-media-swcodec-releaseandroid14-mainline-media-releaseandroid14-mainline-extservices-releaseandroid14-mainline-conscrypt-releaseandroid14-mainline-cellbroadcast-releaseandroid14-mainline-art-releaseandroid14-mainline-appsearch-releaseandroid14-mainline-adservices-releaseandroid14-mainline-adbd-release

This updates Android.bp to still use the old version of libbitflags instead
of the most recent version. Also update the patch file for Android.bp which
ensures version 1.3.2 is still used after an update.

Test: Build
Change-Id: If96fa9dee10e4af0aedc8f199e7399a8d4aaf7ed

2 files changed, 16 insertions, 5 deletions

diff --git a/Android.bp b/Android.bp
index 538e284..d111544 100644
--- a/Android.bp
+++ b/Android.bp
@@ -28,7 +28,7 @@ rust_library_rlib {
     srcs: ["src/lib.rs"],
     edition: "2018",
     rustlibs: [
-        "libbitflags",
+        "libbitflags-1.3.2",
         "liblog_rust_nostd",
         "libzerocopy_nostd",
     ],
@@ -54,7 +54,7 @@ rust_test {
     auto_gen_config: true,
     edition: "2018",
     rustlibs: [
-        "libbitflags",
+        "libbitflags-1.3.2",
         "liblog_rust",
         "libzerocopy",
     ],
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
index a89d5a7..8896c52 100644
--- a/patches/Android.bp.patch
+++ b/patches/Android.bp.patch
@@ -1,15 +1,26 @@
 diff --git a/Android.bp b/Android.bp
-index 07e10b6..5949f7f 100644
+index f635115..d111544 100644
 --- a/Android.bp
 +++ b/Android.bp
-@@ -29,8 +29,8 @@ rust_library {
+@@ -28,9 +28,9 @@ rust_library_rlib {
+     srcs: ["src/lib.rs"],
      edition: "2018",
      rustlibs: [
-         "libbitflags",
+-        "libbitflags",
 -        "liblog_rust",
 -        "libzerocopy",
++        "libbitflags-1.3.2",
 +        "liblog_rust_nostd",
 +        "libzerocopy_nostd",
      ],
      apex_available: [
          "//apex_available:platform",
+@@ -54,7 +54,7 @@ rust_test {
+     auto_gen_config: true,
+     edition: "2018",
+     rustlibs: [
+-        "libbitflags",
++        "libbitflags-1.3.2",
+         "liblog_rust",
+         "libzerocopy",
+     ],