1diff --git a/rutabaga_gfx/Android.bp b/rutabaga_gfx/Android.bp 2index 05d589ae..77c154be 100644 3--- a/rutabaga_gfx/Android.bp 4+++ b/rutabaga_gfx/Android.bp 5@@ -33,13 +33,25 @@ rust_library { 6 "libthiserror", 7 ], 8 proc_macros: ["libremain"], 9- static_libs: [ 10- "libgbm", 11- "libvirglrenderer", 12- ], 13- shared_libs: [ 14- "libdrm", 15- "libepoxy", 16- ], 17+ target: { 18+ host: { 19+ features: ["gfxstream"], 20+ shared_libs: [ 21+ "libgfxstream_backend", 22+ "libvirglrenderer", 23+ ], 24+ }, 25+ android: { 26+ shared_libs: [ 27+ "libcutils", 28+ "libdrm", 29+ ], 30+ static_libs: [ 31+ "libepoxy", 32+ "libgbm", 33+ "libvirglrenderer", 34+ ], 35+ }, 36+ }, 37 } 38 39@@ -71,12 +95,24 @@ rust_test { 40 "libthiserror", 41 ], 42 proc_macros: ["libremain"], 43- static_libs: [ 44- "libgbm", 45- "libvirglrenderer", 46- ], 47- shared_libs: [ 48- "libdrm", 49- "libepoxy", 50- ], 51+ target: { 52+ host: { 53+ features: ["gfxstream"], 54+ shared_libs: [ 55+ "libgfxstream_backend", 56+ "libvirglrenderer", 57+ ], 58+ }, 59+ android: { 60+ shared_libs: [ 61+ "libcutils", 62+ "libdrm", 63+ ], 64+ static_libs: [ 65+ "libepoxy", 66+ "libgbm", 67+ "libvirglrenderer", 68+ ], 69+ }, 70+ }, 71 } 72