aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Hansson <hansson@google.com>2019-01-15 14:15:47 +0000
committerAnton Hansson <hansson@google.com>2019-01-15 14:23:32 +0000
commitee8e266bd4c63b51751f5cd7804fbd88723f2bba (patch)
treed2bdc4bbab900303d6ee2263f42937b11e180c39
parent4dbc7d8b1442149edd924fa3881d06eea566cd7a (diff)
downloadchromium-webview-ee8e266bd4c63b51751f5cd7804fbd88723f2bba.tar.gz
Revert "Move webview to /product"
This reverts commit c9b14af89f39430c8118ee0ee7b86fc8a71395b7. Reason for revert: breaks products with artifact enforcements Test: no Change-Id: Ib567e770cef77a1cef8aee46c23519e1156e3aa6
-rw-r--r--Android.mk1
-rw-r--r--CleanSpec.mk2
2 files changed, 2 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 566b02e..581462e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -22,7 +22,6 @@ 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 6e9f5aa..5464a64 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -47,6 +47,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libwebviewchromium.so)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/libwebviewchromium.so)
$(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)
# ******************************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER