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 /libdiskconfig | |
| 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 'libdiskconfig')
| -rw-r--r-- | libdiskconfig/Android.bp | 32 | ||||
| -rw-r--r-- | libdiskconfig/Android.mk | 29 |
2 files changed, 32 insertions, 29 deletions
diff --git a/libdiskconfig/Android.bp b/libdiskconfig/Android.bp new file mode 100644 index 000000000..041fd63b0 --- /dev/null +++ b/libdiskconfig/Android.bp @@ -0,0 +1,32 @@ +cc_library { + name: "libdiskconfig", + srcs: [ + "diskconfig.c", + "diskutils.c", + "write_lst.c", + "config_mbr.c", + ], + + shared_libs: [ + "libcutils", + "liblog", + ], + cflags: ["-Werror"], + export_include_dirs: ["include"], + local_include_dirs: ["include"], + + target: { + darwin: { + enabled: false, + }, + linux: { + cflags: [ + "-O2", + "-g", + "-W", + "-Wall", + "-D_LARGEFILE64_SOURCE", + ], + }, + }, +} diff --git a/libdiskconfig/Android.mk b/libdiskconfig/Android.mk deleted file mode 100644 index a49ce5825..000000000 --- a/libdiskconfig/Android.mk +++ /dev/null @@ -1,29 +0,0 @@ -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -commonSources := \ - diskconfig.c \ - diskutils.c \ - write_lst.c \ - config_mbr.c - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(commonSources) -LOCAL_MODULE := libdiskconfig -LOCAL_MODULE_TAGS := optional -LOCAL_SYSTEM_SHARED_LIBRARIES := libcutils liblog libc -LOCAL_CFLAGS := -Werror -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include -LOCAL_C_INCLUDES := $(LOCAL_PATH)/include -include $(BUILD_SHARED_LIBRARY) - -ifeq ($(HOST_OS),linux) -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(commonSources) -LOCAL_MODULE := libdiskconfig_host -LOCAL_MODULE_TAGS := optional -LOCAL_CFLAGS := -O2 -g -W -Wall -Werror -D_LARGEFILE64_SOURCE -LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include -LOCAL_C_INCLUDES := $(LOCAL_PATH)/include -include $(BUILD_HOST_STATIC_LIBRARY) -endif # HOST_OS == linux |