commit a3f8f40f0502ee72e8039b674464095a019ded39
author Prashant Malani <pmalani@google.com> Wed Mar 16 20:27:51 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 16 20:27:51 2016 +0000
tree e3660ef54936af21bc22e64461ce97bd3734bdec
parent efcd23ba1dbd1f399929e68d10262de7b0e11ef7
parent 66a9fa8aa749243d047e8c8fc63d7f6cec91109e

libnativeloader: Make webviewchromium so file optional
am: 75dda75

* commit '75dda7551f6a3499c0c45ed0f9530353c7616357':
  libnativeloader: Make webviewchromium so file optional

libnativeloader/Android.mk

diff --git a/libnativeloader/Android.mk b/libnativeloader/Android.mk
index 6c064c7..d8aed8d 100644
--- a/libnativeloader/Android.mk
+++ b/libnativeloader/Android.mk
@@ -14,6 +14,9 @@
 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_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_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 3e4b15a..dfd74d3 100644
--- a/libnativeloader/native_loader.cpp
+++ b/libnativeloader/native_loader.cpp
@@ -55,7 +55,9 @@
                                             "libRS.so:"
                                             "libstdc++.so:"
                                             "libvulkan.so:"
+#if !defined(IGNORE_WEBVIEW_CHROMIUM)
                                             "libwebviewchromium_plat_support.so:"
+#endif
                                             "libz.so";
 
 class LibraryNamespaces {