From 06d019ef0a21f6765cc477f30f7ef60526f20d82 Mon Sep 17 00:00:00 2001
From: Gustav Sennton <gsennton@google.com>
Date: Wed, 21 Jun 2017 18:03:49 +0100
Subject: Move the WebView loader to frameworks/base.

Bug: 62445369
Test: run WebView using app and ensure it loads WebView.
Change-Id: I8d5f85a746203222bfb582317e5caff44cf06724
---
 chromium/Android.mk | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

(limited to 'chromium/Android.mk')

diff --git a/chromium/Android.mk b/chromium/Android.mk
index 7595858..1e92077 100644
--- a/chromium/Android.mk
+++ b/chromium/Android.mk
@@ -14,8 +14,7 @@
 # limitations under the License.
 #
 
-# This package provides the system interfaces required to load WebView and allow
-# it to render.
+# This package provides the system interfaces allowing WebView to render.
 
 LOCAL_PATH := $(call my-dir)
 
@@ -52,25 +51,3 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_CFLAGS := -Wno-unused-parameter
 
 include $(BUILD_SHARED_LIBRARY)
-
-
-# Loader library which handles address space reservation and relro sharing.
-# Does NOT link any native chromium code.
-include $(CLEAR_VARS)
-
-LOCAL_MODULE:= libwebviewchromium_loader
-
-LOCAL_SRC_FILES := \
-        loader/loader.cpp \
-
-LOCAL_CFLAGS := \
-        -Werror \
-
-LOCAL_SHARED_LIBRARIES += \
-        libdl \
-        liblog \
-        libnativeloader \
-
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_SHARED_LIBRARY)
-- 
cgit v1.2.3