diff options
| author | Elliott Hughes <enh@google.com> | 2014-07-10 00:49:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-10 00:49:48 +0000 |
| commit | c74d5ba601aafaa6ce59a6a55a77656f069389f9 (patch) | |
| tree | 472b69058847e3d2cb4ff6a07e6317dd652a26a4 | |
| parent | 41d05f2f7fc0273b678751abc3553a1bcb999352 (diff) | |
| parent | 399e808f940777d18efe377bd34f738dc84729e0 (diff) | |
| download | libxml2-lollipop-mr1-cts-release.tar.gz | |
am 399e808f: Merge "Switch libxml2 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
* commit '399e808f940777d18efe377bd34f738dc84729e0':
Switch libxml2 to the new icu.
| -rw-r--r-- | Android.mk | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -50,7 +50,8 @@ common_SRC_FILES := \ buf.c \ common_C_INCLUDES += \ - $(LOCAL_PATH)/include + $(LOCAL_PATH)/include \ + external/icu/icu4c/source/common \ # Turn off warnings to prevent log message spam # These warnings are not disabled because they are not supported by gcc 4.2.1 @@ -69,7 +70,7 @@ DISABLED_WARNING_FLAGS := \ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(common_SRC_FILES) -LOCAL_C_INCLUDES += $(common_C_INCLUDES) external/icu4c/common +LOCAL_C_INCLUDES += $(common_C_INCLUDES) LOCAL_SHARED_LIBRARIES += $(common_SHARED_LIBRARIES) LOCAL_CFLAGS += -fvisibility=hidden LOCAL_CFLAGS += $(DISABLED_WARNING_FLAGS) @@ -91,7 +92,7 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_SRC_FILES := $(common_SRC_FILES) -LOCAL_C_INCLUDES += $(common_C_INCLUDES) external/icu4c/common +LOCAL_C_INCLUDES += $(common_C_INCLUDES) LOCAL_CFLAGS += $(DISABLED_WARNING_FLAGS) LOCAL_SHARED_LIBRARIES += $(common_SHARED_LIBRARIES) LOCAL_MODULE:= libxml2 |