Split package creation into separate makefile.

To allow the package to be overridden, define it in its own makefile and
include it from Android.mk.

Bug: 16329371
Change-Id: I6a3d77ceb65649b6305b64972634862ca9cbd4d4
diff --git a/chromium/Android.mk b/chromium/Android.mk
index 0b75dd3..fb25d0b 100644
--- a/chromium/Android.mk
+++ b/chromium/Android.mk
@@ -19,73 +19,6 @@
 LOCAL_PATH := $(call my-dir)
 CHROMIUM_PATH := external/chromium_org
 
-# Java glue layer JAR, calls directly into the chromium AwContents Java API.
-include $(CLEAR_VARS)
-
-LOCAL_PACKAGE_NAME := webview
-
-LOCAL_MANIFEST_FILE := AndroidManifest.xml
-
-LOCAL_PRIVILEGED_MODULE := true
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_STATIC_JAVA_LIBRARIES += android_webview_java_with_new_resources
-
-LOCAL_SRC_FILES := $(call all-java-files-under, java)
-
-LOCAL_JARJAR_RULES := $(CHROMIUM_PATH)/android_webview/build/jarjar-rules.txt
-
-include $(CHROMIUM_PATH)/android_webview/build/resources_config.mk
-LOCAL_RESOURCE_DIR := \
-    $(LOCAL_PATH)/res \
-    $(android_webview_resources_dirs)
-LOCAL_AAPT_FLAGS := $(android_webview_aapt_flags)
-LOCAL_AAPT_FLAGS += --extra-packages com.android.webview.chromium
-LOCAL_AAPT_FLAGS += --shared-lib
-LOCAL_AAPT_FLAGS += --version-code 1
-
-LOCAL_JNI_SHARED_LIBRARIES += libwebviewchromium
-
-LOCAL_MULTILIB := both
-
-# TODO: filter webviewchromium_webkit_strings based on PRODUCT_LOCALES.
-LOCAL_REQUIRED_MODULES := \
-        libwebviewchromium \
-        libwebviewchromium_loader \
-        libwebviewchromium_plat_support
-
-LOCAL_PROGUARD_ENABLED := full
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
-LOCAL_JAVACFLAGS := -Xlint:unchecked -Werror
-
-include $(BUILD_PACKAGE)
-
-$(LOCAL_BUILT_MODULE): $(android_webview_intermediates_pak_additional_deps)
-$(LOCAL_BUILT_MODULE): PRIVATE_ASSET_DIR += $(android_webview_asset_dirs)
-# This is needed to force the grd->string.xml conversion to run before we
-# attempt to generate the R.java file.
-$(R_file_stamp): $(call intermediates-dir-for,GYP,android_webview_resources)/android_webview_resources.stamp
-
-ifneq ($(strip $(LOCAL_JARJAR_RULES)),)
-# Add build rules to check that the jarjar'ed jar only contains whitelisted
-# packages. Only enable this when we are running jarjar.
-LOCAL_JAR_CHECK_WHITELIST := $(LOCAL_PATH)/jar_package_whitelist.txt
-
-jar_check_ok := $(intermediates.COMMON)/jar_check_ok
-$(jar_check_ok): PRIVATE_JAR_CHECK := $(LOCAL_PATH)/tools/jar_check.py
-$(jar_check_ok): PRIVATE_JAR_CHECK_WHITELIST := $(LOCAL_JAR_CHECK_WHITELIST)
-$(jar_check_ok): $(full_classes_jarjar_jar) $(LOCAL_PATH)/tools/jar_check.py $(LOCAL_JAR_CHECK_WHITELIST)
-	@echo Jar check: $@
-	$(hide) $(PRIVATE_JAR_CHECK) $< $(PRIVATE_JAR_CHECK_WHITELIST)
-	$(hide) touch $@
-
-$(LOCAL_BUILT_MODULE): $(jar_check_ok)
-endif
-
-
-
 # Native support library (libwebviewchromium_plat_support.so) - does NOT link
 # any native chromium code.
 include $(CLEAR_VARS)
@@ -140,5 +73,9 @@
 
 include $(BUILD_SHARED_LIBRARY)
 
+
+# Include the makefile for the main package.
+include $(LOCAL_PATH)/package.mk
+
 # Build other stuff
 include $(call first-makefiles-under,$(LOCAL_PATH))
diff --git a/chromium/package.mk b/chromium/package.mk
new file mode 100644
index 0000000..a7859bc
--- /dev/null
+++ b/chromium/package.mk
@@ -0,0 +1,85 @@
+#
+# 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.
+#
+
+# This package provides the 'glue' layer between Chromium and WebView.
+
+LOCAL_PATH := $(call my-dir)
+CHROMIUM_PATH := external/chromium_org
+
+# Java glue layer JAR, calls directly into the chromium AwContents Java API.
+include $(CLEAR_VARS)
+
+LOCAL_PACKAGE_NAME := webview
+
+LOCAL_MANIFEST_FILE := AndroidManifest.xml
+
+LOCAL_PRIVILEGED_MODULE := true
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_STATIC_JAVA_LIBRARIES += android_webview_java_with_new_resources
+
+LOCAL_SRC_FILES := $(call all-java-files-under, java)
+
+LOCAL_JARJAR_RULES := $(CHROMIUM_PATH)/android_webview/build/jarjar-rules.txt
+
+include $(CHROMIUM_PATH)/android_webview/build/resources_config.mk
+LOCAL_RESOURCE_DIR := \
+    $(LOCAL_PATH)/res \
+    $(android_webview_resources_dirs)
+LOCAL_AAPT_FLAGS := $(android_webview_aapt_flags)
+LOCAL_AAPT_FLAGS += --extra-packages com.android.webview.chromium
+LOCAL_AAPT_FLAGS += --shared-lib
+LOCAL_AAPT_FLAGS += --version-code 1
+
+LOCAL_JNI_SHARED_LIBRARIES += libwebviewchromium
+
+LOCAL_MULTILIB := both
+
+# TODO: filter webviewchromium_webkit_strings based on PRODUCT_LOCALES.
+LOCAL_REQUIRED_MODULES := \
+        libwebviewchromium \
+        libwebviewchromium_loader \
+        libwebviewchromium_plat_support
+
+LOCAL_PROGUARD_ENABLED := full
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+
+LOCAL_JAVACFLAGS := -Xlint:unchecked -Werror
+
+include $(BUILD_PACKAGE)
+
+$(LOCAL_BUILT_MODULE): $(android_webview_intermediates_pak_additional_deps)
+$(LOCAL_BUILT_MODULE): PRIVATE_ASSET_DIR += $(android_webview_asset_dirs)
+# This is needed to force the grd->string.xml conversion to run before we
+# attempt to generate the R.java file.
+$(R_file_stamp): $(call intermediates-dir-for,GYP,android_webview_resources)/android_webview_resources.stamp
+
+ifneq ($(strip $(LOCAL_JARJAR_RULES)),)
+# Add build rules to check that the jarjar'ed jar only contains whitelisted
+# packages. Only enable this when we are running jarjar.
+LOCAL_JAR_CHECK_WHITELIST := $(LOCAL_PATH)/jar_package_whitelist.txt
+
+jar_check_ok := $(intermediates.COMMON)/jar_check_ok
+$(jar_check_ok): PRIVATE_JAR_CHECK := $(LOCAL_PATH)/tools/jar_check.py
+$(jar_check_ok): PRIVATE_JAR_CHECK_WHITELIST := $(LOCAL_JAR_CHECK_WHITELIST)
+$(jar_check_ok): $(full_classes_jarjar_jar) $(LOCAL_PATH)/tools/jar_check.py $(LOCAL_JAR_CHECK_WHITELIST)
+	@echo Jar check: $@
+	$(hide) $(PRIVATE_JAR_CHECK) $< $(PRIVATE_JAR_CHECK_WHITELIST)
+	$(hide) touch $@
+
+$(LOCAL_BUILT_MODULE): $(jar_check_ok)
+endif