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

Commit bd97153b authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge \\\"libnativeloader: convert Android.mk to Android.bp\\\" am: 5783dea0 am: 627112a8 

am: 3032c5cc

Change-Id: I6e0a190a24be3d7923607b9769dd1938b887f6a5
parents eab4bde5 3032c5cc

libnativeloader/Android.bp

0 → 100644
+32 −0
Original line number Diff line number Diff line 
// Shared library for target

// ========================================================

cc_library {

    name: "libnativeloader",

    host_supported: true,

    srcs: ["native_loader.cpp"],

    shared_libs: [

        "libnativehelper",

        "liblog",

        "libcutils",

    ],

    static_libs: ["libbase"],

    target: {

        android: {

            shared_libs: ["libdl"],

        },

        host: {

            host_ldlibs: ["-ldl"],

        },

    },

    clang: true,

    cflags: [

        "-Werror",

        "-Wall",

    ],

    cppflags: [

        "-std=gnu++14",

        "-fvisibility=hidden",

    ],

    export_include_dirs: ["include"],

    local_include_dirs: ["include"],

}

libnativeloader/Android.mk

deleted100644 → 0
+0 −58
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)



native_loader_common_src_files := \

  native_loader.cpp



native_loader_common_cflags := -Werror -Wall



# Shared library for target

# ========================================================

include $(CLEAR_VARS)



LOCAL_MODULE:= libnativeloader



LOCAL_SRC_FILES:= $(native_loader_common_src_files)

LOCAL_SHARED_LIBRARIES := libnativehelper liblog libcutils libdl

LOCAL_STATIC_LIBRARIES := libbase

LOCAL_CLANG := true

LOCAL_CFLAGS := $(native_loader_common_cflags)

LOCAL_CPPFLAGS := -std=gnu++14 -fvisibility=hidden

LOCAL_MULTILIB := both

LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include

LOCAL_C_INCLUDES := $(LOCAL_PATH)/include

include $(BUILD_SHARED_LIBRARY)



# Shared library for host

# ========================================================

include $(CLEAR_VARS)



LOCAL_MODULE:= libnativeloader



LOCAL_SRC_FILES:= $(native_loader_common_src_files)

LOCAL_SHARED_LIBRARIES := libnativehelper liblog libcutils

LOCAL_STATIC_LIBRARIES := libbase

LOCAL_CLANG := true

LOCAL_CFLAGS := $(native_loader_common_cflags)

LOCAL_CPPFLAGS := -std=gnu++14 -fvisibility=hidden

LOCAL_LDFLAGS := -ldl

LOCAL_MULTILIB := both

LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include

LOCAL_C_INCLUDES := $(LOCAL_PATH)/include

include $(BUILD_HOST_SHARED_LIBRARY)



# Static library for host

# ========================================================

include $(CLEAR_VARS)



LOCAL_MODULE:= libnativeloader



LOCAL_SRC_FILES:= $(native_loader_common_src_files)

LOCAL_STATIC_LIBRARIES := libnativehelper libcutils liblog libbase

LOCAL_CLANG := true

LOCAL_CFLAGS := $(native_loader_common_cflags)

LOCAL_CPPFLAGS := -std=gnu++14 -fvisibility=hidden

LOCAL_LDFLAGS := -ldl

LOCAL_MULTILIB := both

LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include

LOCAL_C_INCLUDES := $(LOCAL_PATH)/include

include $(BUILD_HOST_STATIC_LIBRARY)