diff options
| -rw-r--r-- | Android.bp | 4 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 17 |
2 files changed, 16 insertions, 5 deletions
@@ -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", + ], |