Revert "libnativeloader: Make webviewchromium so file optional"
This reverts commit 75dda7551f
.
Bug: http://b/27546414
This commit is contained in:
parent
75dda7551f
commit
9c0a202977
|
@ -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
|
||||
|
|
|
@ -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 {
|
||||
|
|
Loading…
Reference in New Issue