openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

libnativeloader: Make webviewchromium so file optional 

am: 75dda75

* commit '75dda7551f6a3499c0c45ed0f9530353c7616357':
  libnativeloader: Make webviewchromium so file optional
This commit is contained in:
Prashant Malani 2016-03-16 20:27:51 +00:00 committed by android-build-merger
parent 5aad3417d5 75dda7551f
commit 93a762a58d
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libnativeloader/Android.mk
View File

@ -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

2
libnativeloader/native_loader.cpp
View File

@ -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 {