aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-12-05Merge "Use "-include" to not fail apps_only build."idea133Ying Wang
2013-12-04Use "-include" to not fail apps_only build.Ying Wang
The conditional on TARGET_BUILD_APPS prevents us from doing pseudo apps_only build (i.e. "tapas <bundled modules>") in a full source tree. Change-Id: Iab8f50cbfb3c049b88968698b561608c1c059643
2013-11-26Merge "Omit platform shared lib target when building apps."Ulas Kirazci
2013-11-26Omit platform shared lib target when building apps.Ulas Kirazci
Does not require including use_rtti.mk and libstlport.mk in app manifests. Change-Id: I8f242513fe7ace8f4d59c916ee4f77ba60b2f849
2013-11-26Merge "Build the icu4c static library with U_STATIC_IMPLEMENTATION."Ulas Kirazci
2013-11-22Build the icu4c static library with U_STATIC_IMPLEMENTATION.C. Sean Young
This property will also be exported to the CFLAGS of users of these static libraries, via LOCAL_EXPORT_CFLAGS. Change-Id: I61b468c256c94aa54dc174d619ab121a6e86c864
2013-10-11am 0a61a367: Update ICU with patch to fix Japanese alphabetic index.Craig Cornelius
* commit '0a61a367aa48577edf1c9ba57c501b8f5e7555d5': Update ICU with patch to fix Japanese alphabetic index.
2013-10-11am b066126e: Merge "Add stubdata/Makefile.in back so icu4c will build for ↵Elliott Hughes
host testing." * commit 'b066126e696d7c5e1be2c5fc23258a07cf281630': Add stubdata/Makefile.in back so icu4c will build for host testing.
2013-10-11Update ICU with patch to fix Japanese alphabetic index.android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-cts-releasekitkat-cts-devCraig Cornelius
Patch from http://bugs.icu-project.org/trac/ticket/10423. Bug: 10809397 (cherry picked from commit 260c3da8a8e46f15a7a433f0ad009bd805b804d4) Change-Id: If514618784c1528d1072d2e3f8792bf60d6283a8
2013-10-11am dad7c485: Merge "Update ICU with patch to fix Japanese alphabetic index."Elliott Hughes
* commit 'dad7c4850119ff4cc8cb3c4c96dca4b695730dd1': Update ICU with patch to fix Japanese alphabetic index.
2013-10-11Merge "Add stubdata/Makefile.in back so icu4c will build for host testing."Elliott Hughes
2013-10-11Add stubdata/Makefile.in back so icu4c will build for host testing.Craig Cornelius
Change-Id: Ic26cd202cc92a543cc2d54e00b08314e7519144e
2013-10-11Merge "Update ICU with patch to fix Japanese alphabetic index."Elliott Hughes
2013-10-11Update ICU with patch to fix Japanese alphabetic index.Craig Cornelius
Patch from http://bugs.icu-project.org/trac/ticket/10423. Bug: 10809397 Change-Id: Ic8507942d72173c0aa72f6eec7825d68de4b84e4
2013-10-07am f835eb77: Merge "Remove manual U_TIMEZONE definition."Elliott Hughes
* commit 'f835eb774086f1f182dab02140818d25c1f75a4a': Remove manual U_TIMEZONE definition.
2013-10-07Merge "Remove manual U_TIMEZONE definition."Elliott Hughes
2013-10-07Remove manual U_TIMEZONE definition.Elliott Hughes
Upstream icu4c now knows about Android's use of 'timezone' rather than glibc's '__timezone'. Change-Id: Idfe18c64216b81f5a520f2d27e64af0e67607014
2013-09-24am 5320860a: Merge "Clean up icu4c\'s stubdata directory."Elliott Hughes
* commit '5320860a5401ee7c7b98050c8acac8e144267e77': Clean up icu4c's stubdata directory.
2013-09-25Merge "Clean up icu4c's stubdata directory."Elliott Hughes
2013-09-24Clean up icu4c's stubdata directory.Elliott Hughes
Bug: 10292865 Change-Id: Ia5169a753ee23d513f4d9cd2800d4626543a2bf7
2013-09-10resolved conflicts for merge of 8f65a294 to klp-dev-plus-aospElliott Hughes
Change-Id: Ifa8f1e1ec8389d4e76f4763bbfb79208fb89158d
2013-09-10Backport CLDR 24 hy weekday name fixes.android-4.4_r0.8android-4.4_r0.7Elliott Hughes
(cherry picked from commit a5462ce7fd731e859534f1d9ce7a3a30d2f477b1) Bug: 10678459 Change-Id: Ifdab5154e98e5e92dee141a083c312fc1cf967b1
2013-09-10am b0db403f: Merge "Backport CLDR 24 hy weekday name fixes."Elliott Hughes
* commit 'b0db403fb63910075b60a7378f333d9a99c8ab4f': Backport CLDR 24 hy weekday name fixes.
2013-09-10Merge "Backport CLDR 24 hy weekday name fixes."Elliott Hughes
2013-09-10Backport CLDR 24 hy weekday name fixes.Elliott Hughes
Bug: 10678459 Change-Id: I5a5cb83bcc4ee1c824eec18284b8d552b30ebc20
2013-09-04am 6b67c2ee: Merge "Remove the Android FieldPositionIterator::getData ↵Elliott Hughes
extension." * commit '6b67c2eef214af9db9f8766eafdd4d6c8e61b652': Remove the Android FieldPositionIterator::getData extension.
2013-09-04am 414e58ec: Merge "Fix upstream icu4c bug in FieldPositionIterator."Elliott Hughes
* commit '414e58ec33003a131b2187e174bddb07292b634a': Fix upstream icu4c bug in FieldPositionIterator.
2013-09-04Merge "Remove the Android FieldPositionIterator::getData extension."tools_r22.2Elliott Hughes
2013-09-04Merge "Fix upstream icu4c bug in FieldPositionIterator."Elliott Hughes
2013-09-04Remove the Android FieldPositionIterator::getData extension.Elliott Hughes
Change-Id: I1fcb7c472159dcb2a9a3cf3b2a23435f06325a12
2013-09-04Fix upstream icu4c bug in FieldPositionIterator.Elliott Hughes
This was blocking us from removing the Android-added FieldPositionIterator::getData API. Bug: http://bugs.icu-project.org/trac/ticket/10354 Change-Id: I8e7f1e04e15bb548f9b99a52c6a73a265f03ab15
2013-08-30am a162a86a: Merge "Fix the build when logging is enabled."Elliott Hughes
* commit 'a162a86accfb8213da7a67e86c15fcf6d1df21e1': Fix the build when logging is enabled.
2013-08-30Merge "Fix the build when logging is enabled."Elliott Hughes
2013-08-30Fix the build when logging is enabled.Elliott Hughes
The new NDK build was broken. Change-Id: I2361bc6a5c3273401340e99918fbc65ba971f849
2013-08-27am 50d26c10: Merge "Make it easy to link icu4c against the logging libraries ↵Elliott Hughes
for easier debugging." * commit '50d26c10a445f802b857c300b11f118e962145eb': Make it easy to link icu4c against the logging libraries for easier debugging.
2013-08-27Merge "Make it easy to link icu4c against the logging libraries for easier ↵Elliott Hughes
debugging."
2013-08-27Make it easy to link icu4c against the logging libraries for easier debugging.Elliott Hughes
Change-Id: I39b8325806d95f259206951542c25e01d5b20e6c
2013-08-27am f5888c41: Merge "Remove \'hani\' in reordering script."Elliott Hughes
* commit 'f5888c4100189055f82e29e296bab402619bec35': Remove 'hani' in reordering script.
2013-08-27Merge "Remove 'hani' in reordering script."Elliott Hughes
2013-08-27Remove 'hani' in reordering script.muzbit.kim
wrong result in ucol_strcollIter() when collation reorder rules is [reorder Hang Hani] and numeric is on. For further details, please refer to below link. http://bugs.icu-project.org/trac/ticket/9915 http://sourceforge.net/mailarchive/message.php?msg_id=30453966 Change-Id: Ia3113df3a35d68f004f12653f765bc6d99ab8608 Signed-off-by: muzbit.kim <muzbit.kim@lge.com>
2013-08-26am b2947208: Fix the ISO-8859-7 aliases in convrtrs.txt.Elliott Hughes
* commit 'b2947208d367c2311d18614aad1b7d7932aaaad2': Fix the ISO-8859-7 aliases in convrtrs.txt.
2013-08-26am 313c18d6: Merge "Fix the ISO-8859-7 aliases in convrtrs.txt."Elliott Hughes
* commit '313c18d6da0caa031241834a93162b234b2cd4fc': Fix the ISO-8859-7 aliases in convrtrs.txt.
2013-08-26Fix the ISO-8859-7 aliases in convrtrs.txt.Elliott Hughes
Bug: 10492721 (cherry picked from commit a95c88722a97cf21593f2246923e1bd121e3c865) Change-Id: Iaa8ac63b5490ceeb4a6bac955f0845392cf6d065
2013-08-26Merge "Fix the ISO-8859-7 aliases in convrtrs.txt."Elliott Hughes
2013-08-26Fix the ISO-8859-7 aliases in convrtrs.txt.Elliott Hughes
Bug: 10492721 Change-Id: I65af2d298ac60743e3d519602aa6c5e39d4d84c5
2013-08-13am 70f13bc1: Merge "Move to the unadulterated icu data."Elliott Hughes
* commit '70f13bc16319dd7a2a437f45c3845b88a9f39de4': Move to the unadulterated icu data.
2013-08-13am 857e1a36: Move to the unadulterated icu data.Elliott Hughes
* commit '857e1a36cf1aad65e8ccc1f9525ef5bf7f6cc218': Move to the unadulterated icu data.
2013-08-13Move to the unadulterated icu data.Elliott Hughes
Bug: 10292865 (cherry picked from commit 3760df17ed3293e3c58b03e560abdc012034f8ad) Change-Id: I28f1986c7bd4e8d6046635880d9ca2def6a62f19
2013-08-14Merge "Move to the unadulterated icu data."Elliott Hughes
2013-08-13Move to the unadulterated icu data.Elliott Hughes
Bug: 10292865 Change-Id: Ia57206d441ffd9e5cb2a1c1ab79ff1424c44084a