Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c0a2029 authored by Dimitry Ivanov's avatar Dimitry Ivanov
Browse files

Revert "libnativeloader: Make webviewchromium so file optional" 

This reverts commit 75dda755.

Bug: http://b/27546414
parent 75dda755

libnativeloader/Android.mk

+0 −9
Original line number Diff line number Diff line
@@ -14,9 +14,6 @@ LOCAL_SHARED_LIBRARIES := libnativehelper liblog libcutils 
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_SHARED_LIBRARIES := libnativehelper liblog libcutils 
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_SRC_FILES:= $(NATIVE_LOADER_COMMON_SRC_FILES) 
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

+0 −2
Original line number Diff line number Diff line
@@ -55,9 +55,7 @@ static const char* kPublicNativeLibraries = "libandroid.so:" 
                                            "libRS.so:"

                                            "libstdc++.so:"

                                            "libvulkan.so:"

#if !defined(IGNORE_WEBVIEW_CHROMIUM)

                                            "libwebviewchromium_plat_support.so:"

#endif

                                            "libz.so";



class LibraryNamespaces {