Reverted back temporary solution with normalize_unicode.cpp clang3.6 compilation.

25 files changed, 24 insertions, 51 deletions

diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index e570e1d688..b14fc439f0 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -25,7 +25,7 @@ define add_prebuild_static_lib
   include $(PREBUILT_STATIC_LIBRARY)
 endef
 
-prebuild_static_libs := osrm protobuf tomcrypt jansson minizip fribidi freetype expat base normalize coding geometry anim platform graphics indexer storage search routing gui render map stats_client succinct opening_hours
+prebuild_static_libs := osrm protobuf tomcrypt jansson minizip fribidi freetype expat base coding geometry anim platform graphics indexer storage search routing gui render map stats_client succinct opening_hours
 
 $(foreach item,$(prebuild_static_libs),$(eval $(call add_prebuild_static_lib,$(item))))
 
@@ -40,7 +40,7 @@ LOCAL_CPP_FEATURES += exceptions rtti
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../
 
 LOCAL_MODULE := mapswithme
-LOCAL_STATIC_LIBRARIES := map render gui routing search storage indexer graphics platform anim geometry coding normalize base expat freetype fribidi minizip jansson tomcrypt protobuf osrm stats_client succinct opening_hours
+LOCAL_STATIC_LIBRARIES := map render gui routing search storage indexer graphics platform anim geometry coding base expat freetype fribidi minizip jansson tomcrypt protobuf osrm stats_client succinct opening_hours
 LOCAL_CFLAGS := -ffunction-sections -fdata-sections -Wno-extern-c-compat
 
 ifneq ($(NDK_DEBUG),1)
diff --git a/base/base.pro b/base/base.pro
index 284eb4fa80..5709bcc700 100644
--- a/base/base.pro
+++ b/base/base.pro
@@ -17,6 +17,7 @@ SOURCES += \
     internal/message.cpp \
     logging.cpp \
     lower_case.cpp \
+    normalize_unicode.cpp \
     object_tracker.cpp \
     resource_pool.cpp \
     runner.cpp \
diff --git a/base/base_tests/base_tests.pro b/base/base_tests/base_tests.pro
index 264493aa5a..a827fb1513 100644
--- a/base/base_tests/base_tests.pro
+++ b/base/base_tests/base_tests.pro
@@ -6,7 +6,7 @@ CONFIG -= app_bundle
 TEMPLATE = app
 
 ROOT_DIR = ../..
-DEPENDENCIES = normalize base
+DEPENDENCIES = base
 
 include($$ROOT_DIR/common.pri)
 
diff --git a/base/normalize/normalize.pro b/base/normalize/normalize.pro
deleted file mode 100644
index 41a77fd73a..0000000000
--- a/base/normalize/normalize.pro
+++ /dev/null
@@ -1,20 +0,0 @@
-# Separate library to avoid Release builds clang compilation hang
-# with Normalization code. TODO: Refactor it out when clang will be fixed.
-# See https://code.google.com/p/android/issues/detail?id=173992 (bug was also filed to Apple).
-
-TARGET = normalize
-TEMPLATE = lib
-CONFIG += staticlib warn_on
-
-ROOT_DIR = ../..
-
-include($$ROOT_DIR/common.pri)
-
-# Override optimization option. Compilation hangs with -O2 and -O3.
-*-clang {
-  QMAKE_CXXFLAGS_RELEASE -= -O2 -O3
-  QMAKE_CXXFLAGS_RELEASE += -Oz
-}
-
-SOURCES += \
-    ../normalize_unicode.cpp \
diff --git a/coding/coding_tests/coding_tests.pro b/coding/coding_tests/coding_tests.pro
index d81602a874..c055b04b88 100644
--- a/coding/coding_tests/coding_tests.pro
+++ b/coding/coding_tests/coding_tests.pro
@@ -6,7 +6,7 @@ TEMPLATE = app
 
 ROOT_DIR = ../..
 
-DEPENDENCIES = coding base normalize minizip tomcrypt succinct
+DEPENDENCIES = coding base minizip tomcrypt succinct
 
 include($$ROOT_DIR/common.pri)
 
diff --git a/generator/generator_tests/generator_tests.pro b/generator/generator_tests/generator_tests.pro
index e999740387..67a05f158c 100644
--- a/generator/generator_tests/generator_tests.pro
+++ b/generator/generator_tests/generator_tests.pro
@@ -4,7 +4,7 @@ CONFIG -= app_bundle
 TEMPLATE = app
 
 ROOT_DIR = ../..
-DEPENDENCIES = generator map routing indexer platform geometry coding base normalize \
+DEPENDENCIES = generator map routing indexer platform geometry coding base \
                expat tess2 protobuf tomcrypt osrm succinct
 
 include($$ROOT_DIR/common.pri)
diff --git a/generator/generator_tool/generator_tool.pro b/generator/generator_tool/generator_tool.pro
index 945b651972..4c3ffe0f1f 100644
--- a/generator/generator_tool/generator_tool.pro
+++ b/generator/generator_tool/generator_tool.pro
@@ -1,7 +1,7 @@
 # Generator binary
 
 ROOT_DIR = ../..
-DEPENDENCIES = generator routing storage indexer platform geometry coding base normalize \
+DEPENDENCIES = generator routing storage indexer platform geometry coding base \
                osrm gflags expat tess2 jansson protobuf tomcrypt \
                succinct stats_client
 
diff --git a/geometry/geometry_tests/geometry_tests.pro b/geometry/geometry_tests/geometry_tests.pro
index a057fe9507..2100e9625d 100644
--- a/geometry/geometry_tests/geometry_tests.pro
+++ b/geometry/geometry_tests/geometry_tests.pro
@@ -6,7 +6,7 @@ CONFIG -= app_bundle
 TEMPLATE = app
 
 ROOT_DIR = ../..
-DEPENDENCIES = indexer geometry base normalize
+DEPENDENCIES = indexer geometry base
 
 include($$ROOT_DIR/common.pri)
 
diff --git a/graphics/graphics_tests/graphics_tests.pro b/graphics/graphics_tests/graphics_tests.pro
index abc79c3242..38f8eddeed 100644
--- a/graphics/graphics_tests/graphics_tests.pro
+++ b/graphics/graphics_tests/graphics_tests.pro
@@ -4,7 +4,7 @@ CONFIG -= app_bundle
 TEMPLATE = app
 
 ROOT_DIR = ../..
-DEPENDENCIES = qt_tstfrm map graphics indexer platform geometry coding base normalize \
+DEPENDENCIES = qt_tstfrm map graphics indexer platform geometry coding base \
                expat freetype fribidi protobuf tomcrypt
 
 include($$ROOT_DIR/common.pri)
diff --git a/gui/gui_tests/gui_tests.pro b/gui/gui_tests/gui_tests.pro
index b5d9a3c322..d2983b1e24 100644
--- a/gui/gui_tests/gui_tests.pro
+++ b/gui/gui_tests/gui_tests.pro
@@ -4,7 +4,7 @@ CONFIG -= app_bundle
 TEMPLATE = app
 
 ROOT_DIR = ../..
-DEPENDENCIES = qt_tstfrm map gui indexer graphics storage platform geometry coding base normalize \
+DEPENDENCIES = qt_tstfrm map gui indexer graphics storage platform geometry coding base \
                expat freetype fribidi protobuf tomcrypt jansson
 
 include($$ROOT_DIR/common.pri)
diff --git a/indexer/indexer_tests/indexer_tests.pro b/indexer/indexer_tests/indexer_tests.pro
index cf34ee32cf..030f44f458 100644
--- a/indexer/indexer_tests/indexer_tests.pro
+++ b/indexer/indexer_tests/indexer_tests.pro
@@ -4,7 +4,7 @@ CONFIG -= app_bundle
 TEMPLATE = app
 
 ROOT_DIR = ../..
-DEPENDENCIES = indexer platform geometry coding base normalize protobuf tomcrypt
+DEPENDENCIES = indexer platform geometry coding base protobuf tomcrypt
 !linux {
 DEPENDENCIES += opening_hours
 }
diff --git a/integration_tests/integration_tests.pro b/integration_tests/integration_tests.pro
index 97f91517f5..2ea11d99a5 100644
--- a/integration_tests/integration_tests.pro
+++ b/integration_tests/integration_tests.pro
@@ -11,7 +11,7 @@ CONFIG -= app_bundle
 TEMPLATE = app
 
 ROOT_DIR = ..
-DEPENDENCIES = map routing search storage indexer platform geometry coding base normalize osrm jansson protobuf tomcrypt succinct stats_client
+DEPENDENCIES = map routing search storage indexer platform geometry coding base osrm jansson protobuf tomcrypt succinct stats_client
 
 macx-*: LIBS *= "-framework IOKit" "-framework SystemConfiguration"
 
diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj
index 5e850d0cce..71315b7acc 100644
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -2794,7 +2794,6 @@
 					"-lplatform",
 					"-lgeometry",
 					"-lcoding",
-					"-lnormalize",
 					"-lbase",
 					"-lfreetype",
 					"-lfribidi",
@@ -2912,7 +2911,6 @@
 					"-lplatform",
 					"-lgeometry",
 					"-lcoding",
-					"-lnormalize",
 					"-lbase",
 					"-lfreetype",
 					"-lfribidi",
@@ -3424,7 +3422,6 @@
 					"-lplatform",
 					"-lgeometry",
 					"-lcoding",
-					"-lnormalize",
 					"-lbase",
 					"-lfreetype",
 					"-lfribidi",
@@ -3538,7 +3535,6 @@
 					"-lplatform",
 					"-lgeometry",
 					"-lcoding",
-					"-lnormalize",
 					"-lbase",
 					"-lfreetype",
 					"-lfribidi",
@@ -3655,7 +3651,6 @@
 					"-lplatform",
 					"-lgeometry",
 					"-lcoding",
-					"-lnormalize",
 					"-lbase",
 					"-lfreetype",
 					"-lfribidi",
@@ -3773,7 +3768,6 @@
 					"-lplatform",
 					"-lgeometry",
 					"-lcoding",
-					"-lnormalize",
 					"-lbase",
 					"-lfreetype",
 					"-lfribidi",
@@ -3890,7 +3884,6 @@
 					"-lplatform",
 					"-lgeometry",
 					"-lcoding",
-					"-lnormalize",
 					"-lbase",
 					"-lfreetype",
 					"-lfribidi",
@@ -4005,7 +3998,6 @@
 					"-lplatform",
 					"-lgeometry",
 					"-lcoding",
-					"-lnormalize",
 					"-lbase",
 					"-lfreetype",
 					"-lfribidi",
diff --git a/map/benchmark_tool/benchmark_tool.pro b/map/benchmark_tool/benchmark_tool.pro
index 2676abd1e6..bffff69cda 100644
--- a/map/benchmark_tool/benchmark_tool.pro
+++ b/map/benchmark_tool/benchmark_tool.pro
@@ -6,7 +6,7 @@ CONFIG -= app_bundle
 TEMPLATE = app
 
 ROOT_DIR = ../..
-DEPENDENCIES = map indexer platform geometry coding base normalize gflags protobuf tomcrypt
+DEPENDENCIES = map indexer platform geometry coding base gflags protobuf tomcrypt
 
 include($$ROOT_DIR/common.pri)
 
diff --git a/map/map_tests/map_tests.pro b/map/map_tests/map_tests.pro
index 28c9e8d27b..17df03d4dc 100644
--- a/map/map_tests/map_tests.pro
+++ b/map/map_tests/map_tests.pro
@@ -6,7 +6,7 @@ CONFIG -= app_bundle
 TEMPLATE = app
 
 ROOT_DIR = ../..
-DEPENDENCIES = map render gui routing search storage graphics indexer platform anim geometry coding base normalize \
+DEPENDENCIES = map render gui routing search storage graphics indexer platform anim geometry coding base \
                freetype fribidi expat protobuf tomcrypt jansson osrm stats_client minizip succinct
 
 !linux* {
diff --git a/map/mwm_tests/mwm_tests.pro b/map/mwm_tests/mwm_tests.pro
index 327430858b..526adea8dd 100644
--- a/map/mwm_tests/mwm_tests.pro
+++ b/map/mwm_tests/mwm_tests.pro
@@ -6,7 +6,7 @@ CONFIG -= app_bundle
 TEMPLATE = app
 
 ROOT_DIR = ../..
-DEPENDENCIES = map gui search storage graphics indexer platform anim geometry coding base normalize \
+DEPENDENCIES = map gui search storage graphics indexer platform anim geometry coding base \
                freetype fribidi expat protobuf tomcrypt jansson
 
 include($$ROOT_DIR/common.pri)
diff --git a/omim.pro b/omim.pro
index f4e2a7aa90..f9698d78bc 100644
--- a/omim.pro
+++ b/omim.pro
@@ -26,7 +26,7 @@ win32:CONFIG(drape) {
   CONFIG *= desktop
 }
 
-SUBDIRS = 3party base base/normalize geometry coding
+SUBDIRS = 3party base geometry coding
 
 SUBDIRS += platform
 SUBDIRS += stats
diff --git a/pedestrian_routing_benchmarks/pedestrian_routing_benchmarks.pro b/pedestrian_routing_benchmarks/pedestrian_routing_benchmarks.pro
index 98b7cbd4de..bdcf6233bc 100644
--- a/pedestrian_routing_benchmarks/pedestrian_routing_benchmarks.pro
+++ b/pedestrian_routing_benchmarks/pedestrian_routing_benchmarks.pro
@@ -4,7 +4,7 @@ CONFIG -= app_bundle
 TEMPLATE = app
 
 ROOT_DIR = ../
-DEPENDENCIES = map routing search storage indexer platform geometry coding base normalize \
+DEPENDENCIES = map routing search storage indexer platform geometry coding base \
                osrm jansson protobuf tomcrypt succinct
 
 macx-*: LIBS *= "-framework IOKit"
diff --git a/platform/platform_tests/platform_tests.pro b/platform/platform_tests/platform_tests.pro
index 9081c3a421..effd0844fe 100644
--- a/platform/platform_tests/platform_tests.pro
+++ b/platform/platform_tests/platform_tests.pro
@@ -4,7 +4,7 @@ CONFIG -= app_bundle
 TEMPLATE = app
 
 ROOT_DIR = ../..
-DEPENDENCIES = platform_tests_support platform coding base normalize minizip tomcrypt jansson
+DEPENDENCIES = platform_tests_support platform coding base minizip tomcrypt jansson
 
 include($$ROOT_DIR/common.pri)
 
diff --git a/qt/qt.pro b/qt/qt.pro
index 511cb13ef5..93a0ee7e99 100644
--- a/qt/qt.pro
+++ b/qt/qt.pro
@@ -1,6 +1,6 @@
 # Main application in qt.
 ROOT_DIR = ..
-DEPENDENCIES = map render gui routing search storage indexer graphics platform anim geometry coding base normalize \
+DEPENDENCIES = map render gui routing search storage indexer graphics platform anim geometry coding base \
                freetype expat fribidi tomcrypt jansson protobuf osrm stats_client minizip succinct
 
 
diff --git a/render/render_tests/render_tests.pro b/render/render_tests/render_tests.pro
index 883528f8c3..37cbaaff38 100644
--- a/render/render_tests/render_tests.pro
+++ b/render/render_tests/render_tests.pro
@@ -5,7 +5,7 @@ TEMPLATE = app
 
 ROOT_DIR = ../..
 
-DEPENDENCIES = render indexer platform geometry coding base normalize
+DEPENDENCIES = render indexer platform geometry coding base
 
 
 include($$ROOT_DIR/common.pri)
diff --git a/routing/routing_tests/routing_tests.pro b/routing/routing_tests/routing_tests.pro
index 3898450339..6c46d3ae7b 100644
--- a/routing/routing_tests/routing_tests.pro
+++ b/routing/routing_tests/routing_tests.pro
@@ -6,7 +6,7 @@ CONFIG -= app_bundle
 TEMPLATE = app
 
 ROOT_DIR = ../..
-DEPENDENCIES = routing indexer platform_tests_support platform geometry coding base normalize \
+DEPENDENCIES = routing indexer platform_tests_support platform geometry coding base \
                osrm protobuf tomcrypt succinct jansson stats_client map
 
 macx-*: LIBS *= "-framework IOKit" "-framework SystemConfiguration"
diff --git a/search/integration_tests/integration_tests.pro b/search/integration_tests/integration_tests.pro
index 93d3abf7c6..4b1acac89f 100644
--- a/search/integration_tests/integration_tests.pro
+++ b/search/integration_tests/integration_tests.pro
@@ -6,7 +6,7 @@ CONFIG -= app_bundle
 TEMPLATE = app
 
 ROOT_DIR = ../..
-DEPENDENCIES = generator routing search storage stats_client jansson indexer platform geometry coding base normalize \
+DEPENDENCIES = generator routing search storage stats_client jansson indexer platform geometry coding base \
                tess2 protobuf tomcrypt
 
 !linux* {
diff --git a/search/search_tests/search_tests.pro b/search/search_tests/search_tests.pro
index 917848728a..fe1a781c77 100644
--- a/search/search_tests/search_tests.pro
+++ b/search/search_tests/search_tests.pro
@@ -6,7 +6,7 @@ CONFIG -= app_bundle
 TEMPLATE = app
 
 ROOT_DIR = ../..
-DEPENDENCIES = search indexer platform geometry coding base normalize protobuf tomcrypt
+DEPENDENCIES = search indexer platform geometry coding base protobuf tomcrypt
 
 include($$ROOT_DIR/common.pri)
 
diff --git a/storage/storage_tests/storage_tests.pro b/storage/storage_tests/storage_tests.pro
index 2cedbb928c..bd89a738a8 100644
--- a/storage/storage_tests/storage_tests.pro
+++ b/storage/storage_tests/storage_tests.pro
@@ -6,7 +6,7 @@ CONFIG -= app_bundle
 TEMPLATE = app
 
 ROOT_DIR = ../..
-DEPENDENCIES = storage indexer platform_tests_support platform geometry coding base normalize jansson tomcrypt stats_client
+DEPENDENCIES = storage indexer platform_tests_support platform geometry coding base jansson tomcrypt stats_client
 
 include($$ROOT_DIR/common.pri)