diff options
author | Dan Willemsen | 2016-07-13 00:10:56 -0500 |
---|---|---|
committer | Dan Willemsen | 2016-07-13 19:41:45 -0500 |
commit | 45f05240c2d9d1f3903e2766b4883e256288f6c2 (patch) | |
tree | ee0405336f534c9b00448860c3df845452e43223 /libdiskconfig | |
parent | dc9fbc34402a61ca9b23714b78cac4f92ee113e2 (diff) | |
download | platform-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.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 @@ | |||
1 | cc_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 @@ | |||
1 | LOCAL_PATH := $(call my-dir) | ||
2 | include $(CLEAR_VARS) | ||
3 | |||
4 | commonSources := \ | ||
5 | diskconfig.c \ | ||
6 | diskutils.c \ | ||
7 | write_lst.c \ | ||
8 | config_mbr.c | ||
9 | |||
10 | include $(CLEAR_VARS) | ||
11 | LOCAL_SRC_FILES := $(commonSources) | ||
12 | LOCAL_MODULE := libdiskconfig | ||
13 | LOCAL_MODULE_TAGS := optional | ||
14 | LOCAL_SYSTEM_SHARED_LIBRARIES := libcutils liblog libc | ||
15 | LOCAL_CFLAGS := -Werror | ||
16 | LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include | ||
17 | LOCAL_C_INCLUDES := $(LOCAL_PATH)/include | ||
18 | include $(BUILD_SHARED_LIBRARY) | ||
19 | |||
20 | ifeq ($(HOST_OS),linux) | ||
21 | include $(CLEAR_VARS) | ||
22 | LOCAL_SRC_FILES := $(commonSources) | ||
23 | LOCAL_MODULE := libdiskconfig_host | ||
24 | LOCAL_MODULE_TAGS := optional | ||
25 | LOCAL_CFLAGS := -O2 -g -W -Wall -Werror -D_LARGEFILE64_SOURCE | ||
26 | LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include | ||
27 | LOCAL_C_INCLUDES := $(LOCAL_PATH)/include | ||
28 | include $(BUILD_HOST_STATIC_LIBRARY) | ||
29 | endif # HOST_OS == linux | ||