Omit platform shared lib target when building apps.
Does not require including use_rtti.mk and libstlport.mk in app
manifests.
Change-Id: I8f242513fe7ace8f4d59c916ee4f77ba60b2f849
diff --git a/common/Android.mk b/common/Android.mk
index 7c8d0d4..fec6d75 100644
--- a/common/Android.mk
+++ b/common/Android.mk
@@ -139,19 +139,21 @@
# Build for the target (device).
#
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES += $(src_files)
-LOCAL_C_INCLUDES += $(c_includes) $(optional_android_logging_includes)
-LOCAL_CFLAGS += $(local_cflags) -DPIC -fPIC
-LOCAL_SHARED_LIBRARIES += libdl $(optional_android_logging_libraries)
-LOCAL_LDLIBS += $(local_ldlibs)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libicuuc
-LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
-LOCAL_REQUIRED_MODULES += icu-data
-include abi/cpp/use_rtti.mk
-include external/stlport/libstlport.mk
-include $(BUILD_SHARED_LIBRARY)
+ifeq ($(TARGET_BUILD_APPS),)
+ include $(CLEAR_VARS)
+ LOCAL_SRC_FILES += $(src_files)
+ LOCAL_C_INCLUDES += $(c_includes) $(optional_android_logging_includes)
+ LOCAL_CFLAGS += $(local_cflags) -DPIC -fPIC
+ LOCAL_SHARED_LIBRARIES += libdl $(optional_android_logging_libraries)
+ LOCAL_LDLIBS += $(local_ldlibs)
+ LOCAL_MODULE_TAGS := optional
+ LOCAL_MODULE := libicuuc
+ LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
+ LOCAL_REQUIRED_MODULES += icu-data
+ include abi/cpp/use_rtti.mk
+ include external/stlport/libstlport.mk
+ include $(BUILD_SHARED_LIBRARY)
+endif
#
diff --git a/i18n/Android.mk b/i18n/Android.mk
index d769c8b..61f36f9 100644
--- a/i18n/Android.mk
+++ b/i18n/Android.mk
@@ -101,18 +101,20 @@
# Build for the target (device).
#
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES += $(src_files)
-LOCAL_C_INCLUDES += $(c_includes) $(optional_android_logging_includes)
-LOCAL_CFLAGS += $(local_cflags) -DPIC -fPIC
-LOCAL_SHARED_LIBRARIES += libicuuc $(optional_android_logging_libraries)
-LOCAL_LDLIBS += $(local_ldlibs)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libicui18n
-LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
-include abi/cpp/use_rtti.mk
-include external/stlport/libstlport.mk
-include $(BUILD_SHARED_LIBRARY)
+ifeq ($(TARGET_BUILD_APPS),)
+ include $(CLEAR_VARS)
+ LOCAL_SRC_FILES += $(src_files)
+ LOCAL_C_INCLUDES += $(c_includes) $(optional_android_logging_includes)
+ LOCAL_CFLAGS += $(local_cflags) -DPIC -fPIC
+ LOCAL_SHARED_LIBRARIES += libicuuc $(optional_android_logging_libraries)
+ LOCAL_LDLIBS += $(local_ldlibs)
+ LOCAL_MODULE_TAGS := optional
+ LOCAL_MODULE := libicui18n
+ LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
+ include abi/cpp/use_rtti.mk
+ include external/stlport/libstlport.mk
+ include $(BUILD_SHARED_LIBRARY)
+endif
#
