commit 9c0a2029771846ecea9121cf249169e581f6f7f5
author Dimitry Ivanov <dimitry@google.com> Wed Mar 16 13:54:33 2016 -0700
committer Dimitry Ivanov <dimitry@google.com> Wed Mar 16 13:54:33 2016 -0700
tree 05a59884b3c476bbd33140cc63c0856920424bf8
parent 75dda7551f6a3499c0c45ed0f9530353c7616357

Revert "libnativeloader: Make webviewchromium so file optional"

This reverts commit 75dda7551f6a3499c0c45ed0f9530353c7616357.

Bug: http://b/27546414

libnativeloader/Android.mk

diff --git a/libnativeloader/Android.mk b/libnativeloader/Android.mk
index d8aed8d..6c064c7 100644
--- a/libnativeloader/Android.mk
+++ b/libnativeloader/Android.mk
@@ -14,9 +14,6 @@
 LOCAL_STATIC_LIBRARIES := libbase
 LOCAL_CLANG := true
 LOCAL_CFLAGS += -Werror -Wall
-ifeq ($(TARGET_IGNORE_WEBVIEW_CHROMIUM), true)
-LOCAL_CFLAGS += -DIGNORE_WEBVIEW_CHROMIUM
-endif
 LOCAL_CPPFLAGS := -std=gnu++14 -fvisibility=hidden
 LOCAL_LDFLAGS := -ldl
 LOCAL_MULTILIB := both
@@ -35,9 +32,6 @@
 LOCAL_STATIC_LIBRARIES := libbase
 LOCAL_CLANG := true
 LOCAL_CFLAGS += -Werror -Wall
-ifeq ($(TARGET_IGNORE_WEBVIEW_CHROMIUM), true)
-LOCAL_CFLAGS += -DIGNORE_WEBVIEW_CHROMIUM
-endif
 LOCAL_CPPFLAGS := -std=gnu++14 -fvisibility=hidden
 LOCAL_LDFLAGS := -ldl
 LOCAL_MULTILIB := both
@@ -55,9 +49,6 @@
 LOCAL_STATIC_LIBRARIES := libnativehelper libcutils liblog libbase
 LOCAL_CLANG := true
 LOCAL_CFLAGS += -Werror -Wall
-ifeq ($(TARGET_IGNORE_WEBVIEW_CHROMIUM), true)
-LOCAL_CFLAGS += -DIGNORE_WEBVIEW_CHROMIUM
-endif
 LOCAL_CPPFLAGS := -std=gnu++14 -fvisibility=hidden
 LOCAL_LDFLAGS := -ldl
 LOCAL_MULTILIB := both

libnativeloader/native_loader.cpp

diff --git a/libnativeloader/native_loader.cpp b/libnativeloader/native_loader.cpp
index dfd74d3..3e4b15a 100644
--- a/libnativeloader/native_loader.cpp
+++ b/libnativeloader/native_loader.cpp
@@ -55,9 +55,7 @@
                                             "libRS.so:"
                                             "libstdc++.so:"
                                             "libvulkan.so:"
-#if !defined(IGNORE_WEBVIEW_CHROMIUM)
                                             "libwebviewchromium_plat_support.so:"
-#endif
                                             "libz.so";
 
 class LibraryNamespaces {