diff --git a/android-activity/Cargo.toml b/android-activity/Cargo.toml
index 59b0b54..c05ad3f 100644
--- a/android-activity/Cargo.toml
+++ b/android-activity/Cargo.toml
@@ -27,6 +27,7 @@ rust-version = "1.69.0"
 default = []
 game-activity = []
 native-activity = []
+api-level-30 = ["ndk/api-level-30"]
 
 [dependencies]
 log = "0.4"
diff --git a/android-activity/src/config.rs b/android-activity/src/config.rs
index 7d818ec..2c3dce8 100644
--- a/android-activity/src/config.rs
+++ b/android-activity/src/config.rs
@@ -28,8 +28,6 @@ impl PartialEq for ConfigurationRef {
     }
 }
 impl Eq for ConfigurationRef {}
-unsafe impl Send for ConfigurationRef {}
-unsafe impl Sync for ConfigurationRef {}
 
 impl fmt::Debug for ConfigurationRef {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
diff --git a/android-activity/src/game_activity/ffi.rs b/android-activity/src/game_activity/ffi.rs
index e8be24c..51063ff 100644
--- a/android-activity/src/game_activity/ffi.rs
+++ b/android-activity/src/game_activity/ffi.rs
@@ -16,14 +16,14 @@ use jni_sys::*;
 use libc::{pthread_cond_t, pthread_mutex_t, pthread_t};
 use ndk_sys::{AAssetManager, AConfiguration, ALooper, ALooper_callbackFunc, ANativeWindow, ARect};
 
-#[cfg(all(any(target_os = "android", feature = "test"), target_arch = "arm"))]
+#[cfg(all(any(target_os = "android"), target_arch = "arm"))]
 include!("ffi_arm.rs");
 
-#[cfg(all(any(target_os = "android", feature = "test"), target_arch = "aarch64"))]
+#[cfg(all(any(target_os = "android"), target_arch = "aarch64"))]
 include!("ffi_aarch64.rs");
 
-#[cfg(all(any(target_os = "android", feature = "test"), target_arch = "x86"))]
+#[cfg(all(any(target_os = "android"), target_arch = "x86"))]
 include!("ffi_i686.rs");
 
-#[cfg(all(any(target_os = "android", feature = "test"), target_arch = "x86_64"))]
+#[cfg(all(any(target_os = "android"), target_arch = "x86_64"))]
 include!("ffi_x86_64.rs");