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