diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2016-07-12 22:10:56 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2016-07-13 17:41:45 -0700 |
| commit | 45f05240c2d9d1f3903e2766b4883e256288f6c2 (patch) | |
| tree | ee0405336f534c9b00448860c3df845452e43223 /libnativebridge | |
| parent | dc9fbc34402a61ca9b23714b78cac4f92ee113e2 (diff) | |
| download | system_core-45f05240c2d9d1f3903e2766b4883e256288f6c2.tar.gz system_core-45f05240c2d9d1f3903e2766b4883e256288f6c2.tar.bz2 system_core-45f05240c2d9d1f3903e2766b4883e256288f6c2.zip | |
Convert more Android.mk files to Android.bp
These modules have their dependencies satisfied, and aren't doing
anything strange.
Change-Id: I72039a15256cbd5e5eee0d79a15d66d74a6c087d
Diffstat (limited to 'libnativebridge')
| -rw-r--r-- | libnativebridge/Android.bp | 25 | ||||
| -rw-r--r-- | libnativebridge/Android.mk | 54 |
2 files changed, 25 insertions, 54 deletions
diff --git a/libnativebridge/Android.bp b/libnativebridge/Android.bp new file mode 100644 index 000000000..598dfcdc9 --- /dev/null +++ b/libnativebridge/Android.bp @@ -0,0 +1,25 @@ + +cc_library { + name: "libnativebridge", + + host_supported: true, + srcs: ["native_bridge.cc"], + shared_libs: ["liblog"], + clang: true, + + cflags: [ + "-Werror", + "-Wall", + ], + cppflags: [ + "-std=gnu++11", + "-fvisibility=protected", + ], + + host_ldlibs: ["-ldl"], + target: { + android: { + shared_libs: ["libdl"], + }, + }, +} diff --git a/libnativebridge/Android.mk b/libnativebridge/Android.mk index b88621e7d..3887b1b2f 100644 --- a/libnativebridge/Android.mk +++ b/libnativebridge/Android.mk @@ -1,57 +1,3 @@ LOCAL_PATH:= $(call my-dir) -NATIVE_BRIDGE_COMMON_SRC_FILES := \ - native_bridge.cc - -# Shared library for target -# ======================================================== -include $(CLEAR_VARS) - -LOCAL_MODULE:= libnativebridge - -LOCAL_SRC_FILES:= $(NATIVE_BRIDGE_COMMON_SRC_FILES) -LOCAL_SHARED_LIBRARIES := liblog libdl -LOCAL_CLANG := true -LOCAL_CPP_EXTENSION := .cc -LOCAL_CFLAGS += -Werror -Wall -LOCAL_CPPFLAGS := -std=gnu++11 -fvisibility=protected -LOCAL_MULTILIB := both - -include $(BUILD_SHARED_LIBRARY) - -# Shared library for host -# ======================================================== -include $(CLEAR_VARS) - -LOCAL_MODULE:= libnativebridge - -LOCAL_SRC_FILES:= $(NATIVE_BRIDGE_COMMON_SRC_FILES) -LOCAL_SHARED_LIBRARIES := liblog -LOCAL_CLANG := true -LOCAL_CPP_EXTENSION := .cc -LOCAL_CFLAGS += -Werror -Wall -LOCAL_CPPFLAGS := -std=gnu++11 -fvisibility=protected -LOCAL_LDFLAGS := -ldl -LOCAL_MULTILIB := both - -include $(BUILD_HOST_SHARED_LIBRARY) - -# Static library for host -# ======================================================== -include $(CLEAR_VARS) - -LOCAL_MODULE:= libnativebridge - -LOCAL_SRC_FILES:= $(NATIVE_BRIDGE_COMMON_SRC_FILES) -LOCAL_STATIC_LIBRARIES := liblog -LOCAL_CLANG := true -LOCAL_CPP_EXTENSION := .cc -LOCAL_CFLAGS += -Werror -Wall -LOCAL_CPPFLAGS := -std=gnu++11 -fvisibility=protected -LOCAL_LDFLAGS := -ldl -LOCAL_MULTILIB := both - -include $(BUILD_HOST_STATIC_LIBRARY) - - include $(LOCAL_PATH)/tests/Android.mk |