Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6764f85 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Convert libwebviewchromium_plat_support to Android.bp" am: 1feeeba4 am: e9db0313

am: f1c1db01

Change-Id: I2aaa83120ea4c50bff44dbcbe976795602fdc89f
parents 4c9e8967 f1c1db01
Loading
Loading
Loading
Loading
+43 −0
Original line number Diff line number Diff line
//
// Copyright (C) 2012 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 allowing WebView to render.

// Native support library (libwebviewchromium_plat_support.so) - does NOT link
// any native chromium code.
cc_library_shared {
    name: "libwebviewchromium_plat_support",

    srcs: [
        "draw_gl_functor.cpp",
        "jni_entry_point.cpp",
        "graphics_utils.cpp",
        "graphic_buffer_impl.cpp",
    ],

    shared_libs: [
        "libandroidfw",
        "libandroid_runtime",
        "libcutils",
        "libhwui",
        "liblog",
        "libui",
        "libutils",
    ],

    // To remove warnings from skia header files
    cflags: ["-Wno-unused-parameter"],
}
+0 −52
Original line number Diff line number Diff line
#
# Copyright (C) 2012 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 allowing WebView to render.

LOCAL_PATH := $(call my-dir)

# Native support library (libwebviewchromium_plat_support.so) - does NOT link
# any native chromium code.
include $(CLEAR_VARS)

LOCAL_MODULE:= libwebviewchromium_plat_support

LOCAL_SRC_FILES:= \
        draw_gl_functor.cpp \
        jni_entry_point.cpp \
        graphics_utils.cpp \
        graphic_buffer_impl.cpp \

LOCAL_C_INCLUDES:= \
        external/skia/include/core \
        frameworks/base/core/jni/android/graphics \
        frameworks/native/include/ui \

LOCAL_SHARED_LIBRARIES += \
        libandroid_runtime \
        liblog \
        libcutils \
        libui \
        libutils \
        libhwui \
        libandroidfw

LOCAL_MODULE_TAGS := optional

# To remove warnings from skia header files
LOCAL_CFLAGS := -Wno-unused-parameter

include $(BUILD_SHARED_LIBRARY)
+1 −1
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@
#include <cstdlib>
#include <jni.h>
#include <utils/Log.h>
#include "android/graphics/GraphicsJNI.h"
#include "graphic_buffer_impl.h"
#include "GraphicsJNI.h"
#include "SkCanvasStateUtils.h"
#include "SkGraphics.h"
#include "SkPicture.h"