summaryrefslogtreecommitdiff
path: root/native/webview
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2018-05-09 20:30:33 -0700
committerDan Willemsen <dwillemsen@google.com>2018-05-14 16:47:02 -0700
commit4888b1f6f0f607de913fbd0dc5eaed6575464c06 (patch)
tree662ea285f420c21f406e8dc09b6fbf42b7b28880 /native/webview
parent5d58a302e3dc3e63c1d5cc87807f29863e89b2a9 (diff)
Convert to Soong
See build/soong/README.md for more information. Test: m libframeworks_coretests_jni Test: m FrameworkCoreTests_install Test: m libshim_jni Test: m CtsShimPrivUpgrade Test: m libfilterfw Test: m PMTest_Java_dual Test: m libdefcontainer_jni Test: m libperftestscore_jni Test: m libpmtest32 libpmtest64 Test: m libprintspooler_jni Test: m libsmartcamera_jni Test: m idmap Test: m libdrmframework_jni Test: m libdvr_loader com.google.vr.platform com.google.vr.platform.xml Test: m libfilterpack_imageproc libfilterpack_base Test: m libwebviewchromium_loader Test: m shared_mem_test Test: m test-touchlag Change-Id: I868561dd237fa28647896d59049ab9260373ada1
Diffstat (limited to 'native/webview')
-rw-r--r--native/webview/Android.mk19
-rw-r--r--native/webview/loader/Android.bp32
-rw-r--r--native/webview/loader/Android.mk40
3 files changed, 32 insertions, 59 deletions
diff --git a/native/webview/Android.mk b/native/webview/Android.mk
deleted file mode 100644
index a2a93d7d664d..000000000000
--- a/native/webview/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2017 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Include all the makefiles for subdirectories.
-include $(call all-subdir-makefiles)
-
diff --git a/native/webview/loader/Android.bp b/native/webview/loader/Android.bp
new file mode 100644
index 000000000000..0ba256facb6d
--- /dev/null
+++ b/native/webview/loader/Android.bp
@@ -0,0 +1,32 @@
+//
+// Copyright (C) 2017 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// This package provides the system interfaces required to load WebView.
+
+// Loader library which handles address space reservation and relro sharing.
+// Does NOT link any native chromium code.
+cc_library_shared {
+ name: "libwebviewchromium_loader",
+
+ srcs: ["loader.cpp"],
+
+ cflags: ["-Werror"],
+
+ shared_libs: [
+ "libdl",
+ "liblog",
+ "libnativeloader",
+ ],
+}
diff --git a/native/webview/loader/Android.mk b/native/webview/loader/Android.mk
deleted file mode 100644
index e8a7d9743cb9..000000000000
--- a/native/webview/loader/Android.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Copyright (C) 2017 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# This package provides the system interfaces required to load WebView.
-
-LOCAL_PATH := $(call my-dir)
-
-# Loader library which handles address space reservation and relro sharing.
-# Does NOT link any native chromium code.
-include $(CLEAR_VARS)
-
-LOCAL_MODULE:= libwebviewchromium_loader
-
-LOCAL_SRC_FILES := \
- loader.cpp \
-
-LOCAL_CFLAGS := \
- -Werror \
-
-LOCAL_SHARED_LIBRARIES += \
- libdl \
- liblog \
- libnativeloader \
-
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_SHARED_LIBRARY)
-