summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Willemsen2016-07-13 00:10:56 -0500
committerDan Willemsen2016-07-13 19:41:45 -0500
commit45f05240c2d9d1f3903e2766b4883e256288f6c2 (patch)
treeee0405336f534c9b00448860c3df845452e43223 /libdiskconfig
parentdc9fbc34402a61ca9b23714b78cac4f92ee113e2 (diff)
downloadplatform-system-core-45f05240c2d9d1f3903e2766b4883e256288f6c2.tar.gz
platform-system-core-45f05240c2d9d1f3903e2766b4883e256288f6c2.tar.xz
platform-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.bp32
-rw-r--r--libdiskconfig/Android.mk29
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 @@
1cc_library {
2 name: "libdiskconfig",
3 srcs: [
4 "diskconfig.c",
5 "diskutils.c",
6 "write_lst.c",
7 "config_mbr.c",
8 ],
9
10 shared_libs: [
11 "libcutils",
12 "liblog",
13 ],
14 cflags: ["-Werror"],
15 export_include_dirs: ["include"],
16 local_include_dirs: ["include"],
17
18 target: {
19 darwin: {
20 enabled: false,
21 },
22 linux: {
23 cflags: [
24 "-O2",
25 "-g",
26 "-W",
27 "-Wall",
28 "-D_LARGEFILE64_SOURCE",
29 ],
30 },
31 },
32}
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 @@
1LOCAL_PATH := $(call my-dir)
2include $(CLEAR_VARS)
3
4commonSources := \
5 diskconfig.c \
6 diskutils.c \
7 write_lst.c \
8 config_mbr.c
9
10include $(CLEAR_VARS)
11LOCAL_SRC_FILES := $(commonSources)
12LOCAL_MODULE := libdiskconfig
13LOCAL_MODULE_TAGS := optional
14LOCAL_SYSTEM_SHARED_LIBRARIES := libcutils liblog libc
15LOCAL_CFLAGS := -Werror
16LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
17LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
18include $(BUILD_SHARED_LIBRARY)
19
20ifeq ($(HOST_OS),linux)
21include $(CLEAR_VARS)
22LOCAL_SRC_FILES := $(commonSources)
23LOCAL_MODULE := libdiskconfig_host
24LOCAL_MODULE_TAGS := optional
25LOCAL_CFLAGS := -O2 -g -W -Wall -Werror -D_LARGEFILE64_SOURCE
26LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
27LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
28include $(BUILD_HOST_STATIC_LIBRARY)
29endif # HOST_OS == linux