diff options
| author | Jonathan Dixon <joth@google.com> | 2012-12-26 15:44:20 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-12-26 15:44:20 -0800 |
| commit | 991b0c63bb8c0b0d8577a255b026117e9f37cece (patch) | |
| tree | 6950cf08d709f60d2109d4d82feb186b6197ced5 /chromium/Android.mk | |
| parent | d72ea1e90563e7d3056eef86c3c7dd0c526b718f (diff) | |
| download | webview-991b0c63bb8c0b0d8577a255b026117e9f37cece.tar.gz | |
Revert "Revert "Connect up DrawSW interface""
This re-lands Ie9e6a28213167e0e7eaf9d91668466935d14fe38 as the dependent change has now rolled into android tree.
Change-Id: I121d7de9c1428e773fde54653d7e60fa898c7acd
Diffstat (limited to 'chromium/Android.mk')
| -rw-r--r-- | chromium/Android.mk | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/chromium/Android.mk b/chromium/Android.mk index 1830803..afa3cb7 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,14 +49,19 @@ LOCAL_MODULE:= libwebviewchromium_plat_support LOCAL_SRC_FILES:= \ plat_support/draw_gl_functor.cpp \ - plat_support/jni_entry_point.cpp + plat_support/jni_entry_point.cpp \ + plat_support/graphics_utils.cpp \ LOCAL_C_INCLUDES:= \ - $(CHROMIUM_PATH) + $(CHROMIUM_PATH) \ + external/skia/include/core \ + frameworks/base/core/jni/android/graphics \ LOCAL_SHARED_LIBRARIES += \ + libandroid_runtime \ + libcutils \ + libskia \ libutils \ - libcutils LOCAL_MODULE_TAGS := optional |