diff options
| author | Elliott Hughes <enh@google.com> | 2014-07-09 23:59:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-09 14:45:53 +0000 |
| commit | 6723e5241a45c6de224c96384a595a1bf5bc5449 (patch) | |
| tree | 264da8841394df8d97d608b1cffe1147733b87ac | |
| parent | fa7aae3642754610576328469c6afc68740cec5e (diff) | |
| parent | 85ca2725e854abb18e184edb3d72dae88c12d774 (diff) | |
| download | sfntly-6723e5241a45c6de224c96384a595a1bf5bc5449.tar.gz | |
Merge "Switch sfntly to the new icu."android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-release
| -rw-r--r-- | Android.mk | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -133,8 +133,8 @@ MY_DEFS_Debug := \ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/cpp/src \ $(LOCAL_PATH) \ - external/icu4c/common \ - external/icu4c/i18n \ + external/icu/icu4c/source/common \ + external/icu/icu4c/source/i18n \ frameworks/wilhelm/include \ @@ -216,8 +216,8 @@ MY_DEFS_Release := \ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/cpp/src \ $(LOCAL_PATH) \ - external/icu4c/common \ - external/icu4c/i18n \ + external/icu/icu4c/source/common \ + external/icu/icu4c/source/i18n \ frameworks/wilhelm/include \ @@ -284,4 +284,4 @@ LOCAL_SHARED_LIBRARIES := \ include external/stlport/libstlport.mk -include $(BUILD_STATIC_LIBRARY)
\ No newline at end of file +include $(BUILD_STATIC_LIBRARY) |