From 0493bb2f101540265ccd49754ed1ecc5dcb7b667 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Mon, 9 Jul 2012 17:47:31 -0700 Subject: [PATCH] Use TARGET_BUILD_APPS to distinguish It's in a full build or just an unbundled build. Bug: 6790620 Change-Id: Ifa2df86462747acb8b561ebab879e03b1201b4f7 --- native/jni/Android.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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