diff options
| author | Colin Cross <ccross@android.com> | 2016-07-28 10:53:40 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-28 10:53:40 +0000 |
| commit | 627112a87ed4bb11e321915852e99922a52bbbb0 (patch) | |
| tree | 54bd2e57d8eb832b2448925a2ba4ef20d832f6d3 /libnativeloader | |
| parent | 119d41c18e9a6ea7f04fd3fa65ab2016fb8c6ac9 (diff) | |
| parent | 5783dea0650e96f4b58997d62705f984a12b1e78 (diff) | |
| download | system_core-627112a87ed4bb11e321915852e99922a52bbbb0.tar.gz system_core-627112a87ed4bb11e321915852e99922a52bbbb0.tar.bz2 system_core-627112a87ed4bb11e321915852e99922a52bbbb0.zip | |
Merge \"libnativeloader: convert Android.mk to Android.bp\"
am: 5783dea065
Change-Id: I347c0822bbfcc351a36154391c4cd1bcaa3fc7c2
Diffstat (limited to 'libnativeloader')
| -rw-r--r-- | libnativeloader/Android.bp | 32 | ||||
| -rw-r--r-- | libnativeloader/Android.mk | 58 |
2 files changed, 32 insertions, 58 deletions
diff --git a/libnativeloader/Android.bp b/libnativeloader/Android.bp new file mode 100644 index 000000000..b4a69bcfc --- /dev/null +++ b/libnativeloader/Android.bp @@ -0,0 +1,32 @@ +// 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"], +} diff --git a/libnativeloader/Android.mk b/libnativeloader/Android.mk deleted file mode 100644 index c81c67111..000000000 --- a/libnativeloader/Android.mk +++ /dev/null @@ -1,58 +0,0 @@ -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) |