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

Commit 77c52d2f authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Convert libmediandk to Android.bp"

parents 2e112d77 5f8c8b9f
Loading
Loading
Loading
Loading
+52 −0
Original line number Diff line number Diff line
@@ -30,3 +30,55 @@ ndk_headers {
    srcs: ["include/media/**/*.h"],
    license: "NOTICE",
}

cc_library_shared {
    name: "libmediandk",

    srcs: [
        "NdkMediaCodec.cpp",
        "NdkMediaCrypto.cpp",
        "NdkMediaExtractor.cpp",
        "NdkMediaFormat.cpp",
        "NdkMediaMuxer.cpp",
        "NdkMediaDrm.cpp",
        "NdkImage.cpp",
        "NdkImageReader.cpp",
    ],

    include_dirs: [
        "bionic/libc/private",
        "frameworks/base/core/jni",
        "system/media/camera/include",
    ],

    cflags: [
        "-fvisibility=hidden",
        "-DEXPORT=__attribute__((visibility(\"default\")))",

        "-Werror",
        "-Wall",
    ],

    shared_libs: [
        "libbinder",
        "libmedia",
        "libmediadrm",
        "libstagefright",
        "libstagefright_foundation",
        "liblog",
        "libutils",
        "libcutils",
        "libandroid_runtime",
        "libbinder",
        "libgui",
        "libui",
    ],

    export_include_dirs: ["include"],

    product_variables: {
        pdk: {
            enabled: false,
        },
    },
}

media/ndk/Android.mk

deleted100644 → 0
+0 −63
Original line number Diff line number Diff line
#
# Copyright (C) 2014 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.
#

LOCAL_PATH:= $(call my-dir)

ifneq ($(TARGET_BUILD_PDK), true)

include $(CLEAR_VARS)

LOCAL_SRC_FILES:=                                       \
                  NdkMediaCodec.cpp                     \
                  NdkMediaCrypto.cpp                    \
                  NdkMediaExtractor.cpp                 \
                  NdkMediaFormat.cpp                    \
                  NdkMediaMuxer.cpp                     \
                  NdkMediaDrm.cpp                       \
                  NdkImage.cpp                          \
                  NdkImageReader.cpp                    \

LOCAL_MODULE:= libmediandk

LOCAL_C_INCLUDES := \
    bionic/libc/private \
    frameworks/base/core/jni \
    system/media/camera/include \
    $(LOCAL_PATH)/include

LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include

LOCAL_CFLAGS += -fvisibility=hidden -D EXPORT='__attribute__ ((visibility ("default")))'

LOCAL_CFLAGS += -Werror -Wall

LOCAL_SHARED_LIBRARIES := \
    libbinder \
    libmedia \
    libmediadrm \
    libstagefright \
    libstagefright_foundation \
    liblog \
    libutils \
    libcutils \
    libandroid_runtime \
    libbinder \
    libgui \
    libui \

include $(BUILD_SHARED_LIBRARY)

endif