diff options
Diffstat (limited to 'core/jni/Android.mk')
| -rw-r--r-- | core/jni/Android.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 9b95be1..c6b7631 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -42,6 +42,7 @@ LOCAL_SRC_FILES:= \ android_emoji_EmojiFactory.cpp \ android_view_DisplayEventReceiver.cpp \ android_view_Surface.cpp \ + android_view_SurfaceControl.cpp \ android_view_SurfaceSession.cpp \ android_view_TextureView.cpp \ android_view_InputChannel.cpp \ @@ -91,7 +92,7 @@ LOCAL_SRC_FILES:= \ android/graphics/DrawFilter.cpp \ android/graphics/CreateJavaOutputStreamAdaptor.cpp \ android/graphics/Graphics.cpp \ - android/graphics/HarfbuzzSkia.cpp \ + android/graphics/HarfBuzzNGFaceSkia.cpp \ android/graphics/Interpolator.cpp \ android/graphics/LayerRasterizer.cpp \ android/graphics/MaskFilter.cpp \ @@ -145,7 +146,8 @@ LOCAL_SRC_FILES:= \ android_app_backup_FullBackup.cpp \ android_content_res_ObbScanner.cpp \ android_content_res_Configuration.cpp \ - android_animation_PropertyValuesHolder.cpp + android_animation_PropertyValuesHolder.cpp \ + com_android_internal_net_NetworkStatsFactory.cpp LOCAL_C_INCLUDES += \ $(JNI_H_INCLUDE) \ @@ -155,7 +157,7 @@ LOCAL_C_INCLUDES += \ $(call include-path-for, bluedroid) \ $(call include-path-for, libhardware)/hardware \ $(call include-path-for, libhardware_legacy)/hardware_legacy \ - $(TOP)/frameworks/av/include \ + $(TOP)/frameworks/av/include \ external/skia/include/core \ external/skia/include/effects \ external/skia/include/images \ @@ -170,8 +172,7 @@ LOCAL_C_INCLUDES += \ external/icu4c/i18n \ external/icu4c/common \ external/jpeg \ - external/harfbuzz/contrib \ - external/harfbuzz/src \ + external/harfbuzz_ng/src \ external/zlib \ frameworks/opt/emoji \ libcore/include @@ -203,11 +204,10 @@ LOCAL_SHARED_LIBRARIES := \ libicuuc \ libicui18n \ libmedia \ - libmedia_native \ libwpa_client \ libjpeg \ libusbhost \ - libharfbuzz \ + libharfbuzz_ng \ libz ifeq ($(USE_OPENGL_RENDERER),true) |