diff --git a/native/jni/Android.mk b/native/jni/Android.mk
index a7486ae90..613540993 100644
--- a/native/jni/Android.mk
+++ b/native/jni/Android.mk
@@ -68,9 +68,9 @@ endif # FLAG_DO_PROFILE
 LOCAL_MODULE := libjni_latinime_common_static
 LOCAL_MODULE_TAGS := optional
 
-ifdef ANDROID_BUILD_TOP # In the platform build system
+ifndef TARGET_BUILD_APPS # A full system image build
 include external/stlport/libstlport.mk
-else # In the unbundled build system
+else # An unbundled build
 LOCAL_NDK_VERSION := 7
 LOCAL_SDK_VERSION := 14
 LOCAL_NDK_STL_VARIANT := stlport_static
@@ -96,9 +96,9 @@ endif # FLAG_DO_PROFILE
 LOCAL_MODULE := libjni_latinime
 LOCAL_MODULE_TAGS := optional
 
-ifdef ANDROID_BUILD_TOP # In the platform build system
+ifndef TARGET_BUILD_APPS # A full system image build
 LOCAL_STATIC_LIBRARIES += libstlport_static
-else # In the unbundled build system
+else # An unbundled build
 LOCAL_NDK_VERSION := 7
 LOCAL_SDK_VERSION := 14
 LOCAL_NDK_STL_VARIANT := stlport_static