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
diff --git a/Android.mk b/Android.mk
index 2effc4e..9195e42 100644
--- a/Android.mk
+++ b/Android.mk
@@ -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 1052702..2704406 100644
--- a/chromium/Android.mk
+++ b/chromium/Android.mk
@@ -22,7 +22,7 @@
 # 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 97ca95d..701709d 100644
--- a/chromium/CleanSpec.mk
+++ b/chromium/CleanSpec.mk
@@ -46,6 +46,7 @@
 $(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-stem, rm -rf $(PRODUCT_OUT)/system/priv-app/webviewchromium)
 
 # ******************************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER