diff options
| author | Torne (Richard Coles) <torne@google.com> | 2012-10-23 13:30:52 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2012-11-13 11:04:22 +0000 |
| commit | a05566067d5a010130b0b1aa36eb0d7b3f73e122 (patch) | |
| tree | 6c6f399c7f4b4bfe4a14d38f658ad3e4708045c8 | |
| parent | ab4e30ad8e4335f01462af9bac7fbf40e75c5afd (diff) | |
| download | webview-a05566067d5a010130b0b1aa36eb0d7b3f73e122.tar.gz | |
Add webviewchromium as a dependency of webview.
For now we want to include both the classic and chromium-powered
webviews in the rom, so depend on both here. We also need to include
the makefiles in the subdirectories of frameworks/webview, and have
the webviewchromium module pull in the native code and resources from
external/chromium_org.
Change-Id: Iebf83ad86de6204143336f1977c88bf7d487dbae
| -rw-r--r-- | Android.mk | 6 | ||||
| -rw-r--r-- | chromium/Android.mk | 6 |
2 files changed, 11 insertions, 1 deletions
@@ -22,6 +22,10 @@ include $(CLEAR_VARS) LOCAL_MODULE := webview LOCAL_MODULE_TAGS := optional -LOCAL_REQUIRED_MODULES := libwebcore +LOCAL_REQUIRED_MODULES := libwebcore \ + webviewchromium include $(BUILD_PHONY_PACKAGE) + +# Include all the makefiles for subdirectories. +include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/chromium/Android.mk b/chromium/Android.mk index c2bb9c0..7a8dcb1 100644 --- a/chromium/Android.mk +++ b/chromium/Android.mk @@ -28,6 +28,12 @@ LOCAL_STATIC_JAVA_LIBRARIES += google-common \ LOCAL_SRC_FILES := $(call all-java-files-under, java) +LOCAL_REQUIRED_MODULES := \ + libwebviewchromium \ + webviewchromium_res_chrome \ + webviewchromium_res_chrome_100_percent \ + webviewchromium_res_en-US \ + LOCAL_PROGUARD_ENABLED := disabled include $(BUILD_JAVA_LIBRARY) |