diff --git a/libnativeloader/Android.mk b/libnativeloader/Android.mk index 6c064c706..d8aed8df0 100644 --- a/libnativeloader/Android.mk +++ b/libnativeloader/Android.mk @@ -14,6 +14,9 @@ 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 @@ -32,6 +35,9 @@ 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 @@ -49,6 +55,9 @@ 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 diff --git a/libnativeloader/native_loader.cpp b/libnativeloader/native_loader.cpp index 3e4b15a01..dfd74d34c 100644 --- a/libnativeloader/native_loader.cpp +++ b/libnativeloader/native_loader.cpp @@ -55,7 +55,9 @@ 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 {