diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-08-04 17:03:33 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-08-04 17:38:30 +0100 |
| commit | 51fff92784c3837f6be6344bb25621f129959de6 (patch) | |
| tree | fca9c09efa9e165561d2931936c217fe675efe9c | |
| parent | a763f3deb8c0c6d2226f225af3035411318a8fc1 (diff) | |
| download | webview-51fff92784c3837f6be6344bb25621f129959de6.tar.gz | |
Rename the WebView package.
Rename the WebView package from "webviewchromium" to "webview", removing
the dummy webview package which existed solely to depend on
webviewchromium. We no longer require this layer of abstraction and it
makes it impossible to inherit from webviewchromium correctly.
Bug: 16329371
Change-Id: I1437c7cacb867b2f2d10842a1b9c10aa5c4791e2
| -rw-r--r-- | Android.mk | 14 | ||||
| -rw-r--r-- | chromium/Android.mk | 2 | ||||
| -rw-r--r-- | chromium/CleanSpec.mk | 3 |
3 files changed, 5 insertions, 14 deletions
@@ -14,17 +14,5 @@ # limitations under the License. # -# This package provides a layer of abstraction that allows the WebView -# implementation to be replaced in the dependency graph. - -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE := webview -LOCAL_MODULE_TAGS := optional -LOCAL_REQUIRED_MODULES := webviewchromium - -include $(BUILD_PHONY_PACKAGE) - # Include all the makefiles for subdirectories. -include $(call all-makefiles-under,$(LOCAL_PATH)) +include $(call all-subdir-makefiles) diff --git a/chromium/Android.mk b/chromium/Android.mk index a4902ac..342d690 100644 --- a/chromium/Android.mk +++ b/chromium/Android.mk @@ -25,7 +25,7 @@ ifneq ($(PRODUCT_PREBUILT_WEBVIEWCHROMIUM),yes) # Java glue layer JAR, calls directly into the chromium AwContents Java API. include $(CLEAR_VARS) -LOCAL_PACKAGE_NAME := webviewchromium +LOCAL_PACKAGE_NAME := webview LOCAL_MANIFEST_FILE := AndroidManifest.xml diff --git a/chromium/CleanSpec.mk b/chromium/CleanSpec.mk index 221eb31..1d5b521 100644 --- a/chromium/CleanSpec.mk +++ b/chromium/CleanSpec.mk @@ -44,6 +44,9 @@ #$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f) #$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*) $(call add-clean-step, rm -rf $(TARGET_OUT_JAVA_LIBRARIES)/webviewchromium.*) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/webview) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/webviewchromium.jar) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/webviewchromium) # ****************************************************************** # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER |