summaryrefslogtreecommitdiff
path: root/chromium/Android.mk
diff options
context:
space:
mode:
authorJonathan Dixon <joth@google.com>2012-12-26 11:55:54 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-12-26 11:55:54 -0800
commitd72ea1e90563e7d3056eef86c3c7dd0c526b718f (patch)
treea248c720fe07ed9b6a7bf53bd1fec235e6e48591 /chromium/Android.mk
parent8a8a1f9b5ea238437196790b89f4dbec78fda4e9 (diff)
downloadwebview-d72ea1e90563e7d3056eef86c3c7dd0c526b718f.tar.gz
Revert "Connect up DrawSW interface"
This reverts commit 8a8a1f9b5ea238437196790b89f4dbec78fda4e9 The dependent patch hadn't yet rolled into Android tree - will re-land this one when it does. Change-Id: If4241162a9c26997cdd6636b17cbd4182ac85096
Diffstat (limited to 'chromium/Android.mk')
-rw-r--r--chromium/Android.mk15
1 files changed, 5 insertions, 10 deletions
diff --git a/chromium/Android.mk b/chromium/Android.mk
index afa3cb7..1830803 100644
--- a/chromium/Android.mk
+++ b/chromium/Android.mk
@@ -27,7 +27,7 @@ LOCAL_MODULE := webviewchromium
LOCAL_MODULE_TAGS := optional
LOCAL_STATIC_JAVA_LIBRARIES += google-common \
- android_webview_java \
+ android_webview_java
LOCAL_SRC_FILES := $(call all-java-files-under, java)
@@ -35,7 +35,7 @@ LOCAL_REQUIRED_MODULES := \
libwebviewchromium \
libwebviewchromium_plat_support \
webviewchromium_pak \
- webviewchromium_strings_pak \
+ webviewchromium_strings_pak
LOCAL_PROGUARD_ENABLED := disabled
@@ -49,19 +49,14 @@ LOCAL_MODULE:= libwebviewchromium_plat_support
LOCAL_SRC_FILES:= \
plat_support/draw_gl_functor.cpp \
- plat_support/jni_entry_point.cpp \
- plat_support/graphics_utils.cpp \
+ plat_support/jni_entry_point.cpp
LOCAL_C_INCLUDES:= \
- $(CHROMIUM_PATH) \
- external/skia/include/core \
- frameworks/base/core/jni/android/graphics \
+ $(CHROMIUM_PATH)
LOCAL_SHARED_LIBRARIES += \
- libandroid_runtime \
- libcutils \
- libskia \
libutils \
+ libcutils
LOCAL_MODULE_TAGS := optional