Cherry pickMake the WebView Java library into an APK.

Package the WebView Java code as an APK instead of a JAR. Mark this as a
multiarch app so that dexopt will be run for both architectures on a
multiarch device. Add a CleanSpec to delete the old JAR.

Original Bug: 16329371
Original Change-Id: Ic09958e965b9163ac6b597df7005dd4a05de7a56

Bug: 16723226
Change-Id: I1055313b9f20e71fae87c6ec4493aeb3fba40afb
diff --git a/chromium/Android.mk b/chromium/Android.mk
index 8823abe..fbe1062 100644
--- a/chromium/Android.mk
+++ b/chromium/Android.mk
@@ -22,7 +22,11 @@
 # Java glue layer JAR, calls directly into the chromium AwContents Java API.
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := webviewchromium
+LOCAL_PACKAGE_NAME := webviewchromium
+
+LOCAL_MANIFEST_FILE := AndroidManifest.xml
+
+LOCAL_PRIVILEGED_MODULE := true
 
 LOCAL_MODULE_TAGS := optional
 
@@ -97,7 +101,7 @@
 
 LOCAL_JAVACFLAGS := -Xlint:unchecked -Werror
 
-include $(BUILD_JAVA_LIBRARY)
+include $(BUILD_PACKAGE)
 
 ifneq ($(strip $(LOCAL_JARJAR_RULES)),)
 # Add build rules to check that the jarjar'ed jar only contains whitelisted
diff --git a/chromium/AndroidManifest.xml b/chromium/AndroidManifest.xml
new file mode 100644
index 0000000..16bbf7b
--- /dev/null
+++ b/chromium/AndroidManifest.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.webview">
+    <application android:label="WebView Library" android:multiArch="true">
+        <library android:name="com.android.webview" />
+    </application>
+</manifest>
diff --git a/chromium/CleanSpec.mk b/chromium/CleanSpec.mk
new file mode 100644
index 0000000..221eb31
--- /dev/null
+++ b/chromium/CleanSpec.mk
@@ -0,0 +1,50 @@
+# Copyright (C) 2014 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# If you don't need to do a full clean build but would like to touch
+# a file or delete some intermediate files, add a clean step to the end
+# of the list.  These steps will only be run once, if they haven't been
+# run before.
+#
+# E.g.:
+#     $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
+#     $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
+#
+# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
+# files that are missing or have been moved.
+#
+# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
+# Use $(OUT_DIR) to refer to the "out" directory.
+#
+# If you need to re-do something that's already mentioned, just copy
+# the command and add it to the bottom of the list.  E.g., if a change
+# that you made last week required touching a file and a change you
+# made today requires touching the same file, just copy the old
+# touch step and add it to the end of the list.
+#
+# *****************************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THE BANNER
+# *****************************************************************
+
+# For example:
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
+#$(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.*)
+
+# ******************************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER
+# ******************************************************************