1*b6fb3261SAndroid Build Coastguard Workerdiff -ru a/icu4c/source/common/udata.cpp b/icu4c/source/common/udata.cpp 2*b6fb3261SAndroid Build Coastguard Worker--- a/icu4c/source/common/udata.cpp 2019-04-17 12:03:04.000000000 +0000 3*b6fb3261SAndroid Build Coastguard Worker+++ b/icu4c/source/common/udata.cpp 2020-07-14 23:49:37.836668741 +0000 4*b6fb3261SAndroid Build Coastguard Worker@@ -18,11 +18,10 @@ 5*b6fb3261SAndroid Build Coastguard Worker 6*b6fb3261SAndroid Build Coastguard Worker #include "unicode/utypes.h" /* U_PLATFORM etc. */ 7*b6fb3261SAndroid Build Coastguard Worker 8*b6fb3261SAndroid Build Coastguard Worker-#ifdef __GNUC__ 9*b6fb3261SAndroid Build Coastguard Worker-/* if gcc 10*b6fb3261SAndroid Build Coastguard Worker-#define ATTRIBUTE_WEAK __attribute__ ((weak)) 11*b6fb3261SAndroid Build Coastguard Worker-might have to #include some other header 12*b6fb3261SAndroid Build Coastguard Worker-*/ 13*b6fb3261SAndroid Build Coastguard Worker+#if defined(__GNUC__) || defined(__SUNPRO_CC) 14*b6fb3261SAndroid Build Coastguard Worker+# define ATTRIBUTE_WEAK __attribute__ ((weak)) 15*b6fb3261SAndroid Build Coastguard Worker+#else 16*b6fb3261SAndroid Build Coastguard Worker+# define ATTRIBUTE_WEAK 17*b6fb3261SAndroid Build Coastguard Worker #endif 18*b6fb3261SAndroid Build Coastguard Worker 19*b6fb3261SAndroid Build Coastguard Worker #include "unicode/putil.h" 20*b6fb3261SAndroid Build Coastguard Worker@@ -649,10 +648,9 @@ 21*b6fb3261SAndroid Build Coastguard Worker * partial-data-library access functions where each returns a pointer 22*b6fb3261SAndroid Build Coastguard Worker * to its data package, if it is linked in. 23*b6fb3261SAndroid Build Coastguard Worker */ 24*b6fb3261SAndroid Build Coastguard Worker-/* 25*b6fb3261SAndroid Build Coastguard Worker-extern const void *uprv_getICUData_collation(void) ATTRIBUTE_WEAK; 26*b6fb3261SAndroid Build Coastguard Worker-extern const void *uprv_getICUData_conversion(void) ATTRIBUTE_WEAK; 27*b6fb3261SAndroid Build Coastguard Worker-*/ 28*b6fb3261SAndroid Build Coastguard Worker+U_CDECL_BEGIN 29*b6fb3261SAndroid Build Coastguard Worker+const void *uprv_getICUData_conversion(void) ATTRIBUTE_WEAK; 30*b6fb3261SAndroid Build Coastguard Worker+U_CDECL_END 31*b6fb3261SAndroid Build Coastguard Worker 32*b6fb3261SAndroid Build Coastguard Worker /*----------------------------------------------------------------------* 33*b6fb3261SAndroid Build Coastguard Worker * * 34*b6fb3261SAndroid Build Coastguard Worker@@ -710,10 +708,11 @@ 35*b6fb3261SAndroid Build Coastguard Worker if (uprv_getICUData_collation) { 36*b6fb3261SAndroid Build Coastguard Worker setCommonICUDataPointer(uprv_getICUData_collation(), FALSE, pErrorCode); 37*b6fb3261SAndroid Build Coastguard Worker } 38*b6fb3261SAndroid Build Coastguard Worker+ */ 39*b6fb3261SAndroid Build Coastguard Worker if (uprv_getICUData_conversion) { 40*b6fb3261SAndroid Build Coastguard Worker setCommonICUDataPointer(uprv_getICUData_conversion(), FALSE, pErrorCode); 41*b6fb3261SAndroid Build Coastguard Worker } 42*b6fb3261SAndroid Build Coastguard Worker- */ 43*b6fb3261SAndroid Build Coastguard Worker+ 44*b6fb3261SAndroid Build Coastguard Worker #if !defined(ICU_DATA_DIR_WINDOWS) 45*b6fb3261SAndroid Build Coastguard Worker // When using the Windows system data, we expect only a single data file. 46*b6fb3261SAndroid Build Coastguard Worker setCommonICUDataPointer(&U_ICUDATA_ENTRY_POINT, FALSE, pErrorCode); 47*b6fb3261SAndroid Build Coastguard Worker { 48*b6fb3261SAndroid Build Coastguard Workerdiff -ru a/icu4c/source/common/unicode/uconfig.h b/icu4c/source/common/unicode/uconfig.h 49*b6fb3261SAndroid Build Coastguard Worker--- a/icu4c/source/common/unicode/uconfig.h 2019-04-17 12:03:04.000000000 +0000 50*b6fb3261SAndroid Build Coastguard Worker+++ b/icu4c/source/common/unicode/uconfig.h 2020-07-14 23:49:37.836668741 +0000 51*b6fb3261SAndroid Build Coastguard Worker@@ -55,6 +55,11 @@ 52*b6fb3261SAndroid Build Coastguard Worker #include "uconfig_local.h" 53*b6fb3261SAndroid Build Coastguard Worker #endif 54*b6fb3261SAndroid Build Coastguard Worker 55*b6fb3261SAndroid Build Coastguard Worker+// Tensorflow is statically linked on all platforms. 56*b6fb3261SAndroid Build Coastguard Worker+#ifndef U_STATIC_IMPLEMENTATION 57*b6fb3261SAndroid Build Coastguard Worker+#define U_STATIC_IMPLEMENTATION 58*b6fb3261SAndroid Build Coastguard Worker+#endif 59*b6fb3261SAndroid Build Coastguard Worker+ 60*b6fb3261SAndroid Build Coastguard Worker /** 61*b6fb3261SAndroid Build Coastguard Worker * \def U_DEBUG 62*b6fb3261SAndroid Build Coastguard Worker * Determines whether to include debugging code. 63