summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk9
1 files changed, 7 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index a1527f7..374931c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -151,8 +151,10 @@ LOCAL_C_INCLUDES := \
external/libxslt \
external/hyphenation \
external/skia/emoji \
+ external/skia/gpu/include \
external/skia/include/core \
external/skia/include/effects \
+ external/skia/include/gpu \
external/skia/include/images \
external/skia/include/ports \
external/skia/include/utils \
@@ -374,11 +376,14 @@ LOCAL_SHARED_LIBRARIES := \
libicuuc \
libicui18n \
libmedia \
- libsurfaceflinger_client \
libEGL \
libGLESv2 \
libgui
+ifeq ($(PLATFORM_VERSION),3.1.4.1.5.9.2.6.5)
+LOCAL_SHARED_LIBRARIES += libsurfaceflinger_client
+endif
+
ifeq ($(WEBCORE_INSTRUMENTATION),true)
LOCAL_SHARED_LIBRARIES += libhardware_legacy
endif
@@ -402,7 +407,7 @@ LOCAL_CFLAGS += -DSUPPORT_COMPLEX_SCRIPTS=1
endif
# Build the list of static libraries
-LOCAL_STATIC_LIBRARIES := libxml2 libxslt libhyphenation
+LOCAL_STATIC_LIBRARIES := libxml2 libxslt libhyphenation libskiagpu
ifeq ($(JAVASCRIPT_ENGINE),v8)
LOCAL_STATIC_LIBRARIES += libv8
endif