Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f072fda1 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am effcc83e: Merge "Switch frameworks/base/core/jni to the new icu."

* commit 'effcc83e':
  Switch frameworks/base/core/jni to the new icu.
parents 1f0180bf effcc83e
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ LOCAL_C_INCLUDES += \
	$(call include-path-for, libhardware_legacy)/hardware_legacy \
	$(TOP)/frameworks/av/include \
	$(TOP)/system/media/camera/include \
	external/icu/icu4c/source/common \
	external/skia/src/core \
	external/skia/src/pdf \
	external/skia/src/images \
@@ -171,8 +172,6 @@ LOCAL_C_INCLUDES += \
	external/expat/lib \
	external/openssl/include \
	external/tremor/Tremor \
	external/icu4c/i18n \
	external/icu4c/common \
	external/jpeg \
	external/harfbuzz_ng/src \
	external/zlib \