diff options
-rw-r--r-- | Android.bp | 4 | ||||
-rw-r--r-- | cargo2android-extra-module.bp | 2 | ||||
-rw-r--r-- | patches/Android.bp.diff | 22 |
3 files changed, 3 insertions, 25 deletions
@@ -31,7 +31,7 @@ rust_library { "trace", ], rustlibs: [ - "libbitflags-1.3.2", + "libbitflags", "libfallible_iterator", "libfallible_streaming_iterator", "libhashlink", @@ -56,7 +56,7 @@ rust_library { "trace", ], rustlibs: [ - "libbitflags-1.3.2", + "libbitflags", "libfallible_iterator", "libfallible_streaming_iterator", "libhashlink", diff --git a/cargo2android-extra-module.bp b/cargo2android-extra-module.bp index e0c0fcf..33222cb 100644 --- a/cargo2android-extra-module.bp +++ b/cargo2android-extra-module.bp @@ -10,7 +10,7 @@ rust_library { "trace", ], rustlibs: [ - "libbitflags-1.3.2", + "libbitflags", "libfallible_iterator", "libfallible_streaming_iterator", "libhashlink", diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff deleted file mode 100644 index 53b87f1..0000000 --- a/patches/Android.bp.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index c0ca574..9de5ea6 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -31,7 +31,7 @@ rust_library { - "trace", - ], - rustlibs: [ -- "libbitflags", -+ "libbitflags-1.3.2", - "libfallible_iterator", - "libfallible_streaming_iterator", - "libhashlink", -@@ -56,7 +56,7 @@ rust_library { - "trace", - ], - rustlibs: [ -- "libbitflags", -+ "libbitflags-1.3.2", - "libfallible_iterator", - "libfallible_streaming_iterator", - "libhashlink", |