upgrade glsl-to-spirv and add android features

Cargo.toml

@@ -29,6 +29,22 @@ default = [
     "mp3",
     "x11",
 ]
+
+supported_android_features = [
+    # cpal is not supported yet
+    # "bevy_audio",
+    "bevy_dynamic_plugin",
+    "bevy_gilrs",
+    "bevy_gltf",
+    "bevy_wgpu",
+    "bevy_winit",
+    "render",
+    "png",
+    "hdr",
+    # "mp3",
+    "x11",
+]
+
 profiler = ["bevy_ecs/profiler", "bevy_diagnostic/profiler"]
 wgpu_trace = ["bevy_wgpu/trace"]
 
@@ -83,18 +99,18 @@ bevy_wgpu = { path = "crates/bevy_wgpu", optional = true, version = "0.2.1" }
 bevy_winit = { path = "crates/bevy_winit", optional = true, version = "0.2.1" }
 bevy_gilrs = { path = "crates/bevy_gilrs", optional = true, version = "0.2.1" }
 
-# bevy (Android)
-[target.'cfg(target_os = "android")'.dependencies]
-ndk-glue = { version = "0.2", features = ["logger"] }
-android_logger = "0.9"
-
 [dev-dependencies]
 rand = "0.7.3"
 serde = { version = "1", features = ["derive"] }
 log = "0.4"
 ron = "0.6"
 anyhow = "1.0"
 
+# bevy (Android)
+[target.'cfg(target_os = "android")'.dependencies]
+ndk-glue = { version = "0.2", features = ["logger"] }
+android_logger = "0.9"
+
 [target.'cfg(target_arch = "wasm32")'.dev-dependencies]
 console_error_panic_hook = "0.1.6"
 console_log = { version = "0.2", features = ["color"] }
@@ -322,8 +338,8 @@ crate-type = ["cdylib"]
 
 [package.metadata.android]
 build_targets = [ "aarch64-linux-android", "armv7-linux-androideabi" ]
-target_sdk_version = 29
-min_sdk_version = 29
+target_sdk_version = 28
+min_sdk_version = 28
 
 [[package.metadata.android.feature]]
 name = "android.hardware.vulkan.level"

crates/bevy_render/Cargo.toml

@@ -48,7 +48,7 @@ parking_lot = "0.11.0"
 spirv-reflect = "0.2.3"
 
 [target.'cfg(all(not(target_os = "ios"), not(target_arch = "wasm32")))'.dependencies]
-bevy-glsl-to-spirv = "0.1.7"
+bevy-glsl-to-spirv = "0.2.0"
 
 [target.'cfg(target_os = "ios")'.dependencies]
 shaderc = "0.6.3"