From e6be2da492e38b24b1a35c0a2c8f0448663c5888 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Tue, 15 Jan 2019 14:32:02 +0000
Subject: Revert "Revert "Move webview to /product""

This reverts commit ee8e266bd4c63b51751f5cd7804fbd88723f2bba.

Test: forrest run of previously failing target
Exempt-From-Owner-Approval: approved already
Reason for revert: build breakage fixed

Change-Id: Ic5fe46f90460bbe97c23d08e89d57d702d43c548
---
 Android.mk   | 1 +
 CleanSpec.mk | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Android.mk b/Android.mk
index 581462e..566b02e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -22,6 +22,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := webview
 LOCAL_MODULE_CLASS := APPS
+LOCAL_PRODUCT_MODULE := true
 LOCAL_MULTILIB := both
 LOCAL_CERTIFICATE := $(DEFAULT_SYSTEM_DEV_CERTIFICATE)
 LOCAL_REQUIRED_MODULES := \
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 5464a64..d1c6298 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -49,6 +49,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/webview)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/webview)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product/app/webview)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/product/app/webview)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/webview)
 
 # ******************************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER
-- 
cgit v1.2.3