1diff --git a/rutabaga_gfx/Android.bp b/rutabaga_gfx/Android.bp 2index b99e49886..6c37c03da 100644 3--- a/rutabaga_gfx/Android.bp 4+++ b/rutabaga_gfx/Android.bp 5@@ -23,7 +23,6 @@ rust_library { 6 edition: "2021", 7 features: [ 8 "gfxstream", 9- "gfxstream_stub", 10 "virgl_renderer", 11 ], 12 rustlibs: [ 13@@ -35,14 +34,75 @@ rust_library { 14 "libzerocopy", 15 ], 16 proc_macros: ["libremain"], 17+ cfgs: [ 18+ "gfxstream_unstable", 19+ ], 20 shared_libs: [ 21- "libdrm", 22+ "libc++", 23+ "libbase", 24+ ], 25+ target: { 26+ android: { 27+ shared_libs: [ 28+ "libnativewindow", 29+ "libcutils", 30+ "liblog", 31+ ], 32+ }, 33+ host: { 34+ features: ["vulkano"], 35+ rustlibs: [ 36+ "libvulkano", 37+ ], 38+ }, 39+ }, 40+ static_libs: [ 41 "libepoxy", 42 "libgbm", 43+ "libdrm", 44+ "libgfxstream_backend", 45 "libvirglrenderer", 46 ], 47 } 48 49+rust_library { 50+ name: "librutabaga_gfx_gfxstream", 51+ defaults: ["crosvm_inner_defaults"], 52+ host_supported: true, 53+ vendor_available: true, 54+ crate_name: "rutabaga_gfx", 55+ cargo_env_compat: true, 56+ cargo_pkg_version: "0.1.2", 57+ srcs: ["src/lib.rs"], 58+ edition: "2021", 59+ rustlibs: [ 60+ "libcfg_if", 61+ "liblibc", 62+ "liblog_rust", 63+ "libnix", 64+ "libthiserror", 65+ "libzerocopy", 66+ ], 67+ proc_macros: ["libremain"], 68+ cfgs: [ 69+ "gfxstream_unstable", 70+ ], 71+ features: [ 72+ "gfxstream", 73+ ], 74+ shared_libs: [ 75+ "libgfxstream_backend", 76+ ], 77+ target: { 78+ host: { 79+ features: ["vulkano"], 80+ rustlibs: [ 81+ "libvulkano", 82+ ], 83+ }, 84+ }, 85+} 86+ 87 rust_test { 88 name: "rutabaga_gfx_test_src_lib", 89 defaults: ["crosvm_inner_defaults"], 90@@ -59,7 +119,6 @@ rust_test { 91 edition: "2021", 92 features: [ 93 "gfxstream", 94- "gfxstream_stub", 95 "virgl_renderer", 96 ], 97 rustlibs: [ 98@@ -72,9 +131,12 @@ rust_test { 99 ], 100 proc_macros: ["libremain"], 101 shared_libs: [ 102- "libdrm", 103 "libepoxy", 104 "libgbm", 105+ "libgfxstream_backend", 106 "libvirglrenderer", 107 ], 108+ static_libs: [ 109+ "libdrm", 110+ ], 111 } 112