summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Deymo2017-01-12 16:45:52 -0600
committerandroid-build-merger2017-01-12 16:45:52 -0600
commit4786e4e24fb6a79feb5794453122536d837f0fa5 (patch)
tree9828fb9912b48be1864a7ba1e3ff14d2d9c6f629 /libsparse
parent0638e0e65bcab4553551eb3c7687adddda0af52c (diff)
parent092a732ef24d89e048eba751539ff2eec0eb8a0e (diff)
downloadplatform-system-core-4786e4e24fb6a79feb5794453122536d837f0fa5.tar.gz
platform-system-core-4786e4e24fb6a79feb5794453122536d837f0fa5.tar.xz
platform-system-core-4786e4e24fb6a79feb5794453122536d837f0fa5.zip
Remove "_host" and "_static" suffix from libsparse definition. am: b0c395955d am: 7b8d66e7cc am: 11b65cf3be
am: 092a732ef2 Change-Id: I3d9639af9f9f66742660edbbf62f73909c0d6915
Diffstat (limited to 'libsparse')
-rw-r--r--libsparse/Android.bp37
1 files changed, 13 insertions, 24 deletions
diff --git a/libsparse/Android.bp b/libsparse/Android.bp
index 7a6ae8a54..dd8b5fd1d 100644
--- a/libsparse/Android.bp
+++ b/libsparse/Android.bp
@@ -1,7 +1,9 @@
1// Copyright 2010 The Android Open Source Project 1// Copyright 2010 The Android Open Source Project
2 2
3cc_defaults { 3cc_library {
4 name: "libsparse_defaults", 4 name: "libsparse",
5 host_supported: true,
6 unique_host_soname: true,
5 srcs: [ 7 srcs: [
6 "backed_block.c", 8 "backed_block.c",
7 "output_file.c", 9 "output_file.c",
@@ -13,32 +15,19 @@ cc_defaults {
13 cflags: ["-Werror"], 15 cflags: ["-Werror"],
14 local_include_dirs: ["include"], 16 local_include_dirs: ["include"],
15 export_include_dirs: ["include"], 17 export_include_dirs: ["include"],
16}
17
18cc_library_host_static {
19 name: "libsparse_host",
20 defaults: ["libsparse_defaults"],
21 static_libs: ["libz"],
22 target: { 18 target: {
19 host: {
20 shared_libs: ["libz-host"],
21 },
22 android: {
23 shared_libs: ["libz"],
24 },
23 windows: { 25 windows: {
24 enabled: true, 26 enabled: true,
25 }, 27 },
26 }, 28 },
27} 29}
28 30
29cc_library_shared {
30 name: "libsparse",
31 defaults: ["libsparse_defaults"],
32 shared_libs: ["libz"],
33}
34
35cc_library_static {
36 name: "libsparse_static",
37 host_supported: true,
38 defaults: ["libsparse_defaults"],
39 static_libs: ["libz"],
40}
41
42cc_binary { 31cc_binary {
43 name: "simg2img", 32 name: "simg2img",
44 host_supported: true, 33 host_supported: true,
@@ -47,7 +36,7 @@ cc_binary {
47 "sparse_crc32.c", 36 "sparse_crc32.c",
48 ], 37 ],
49 static_libs: [ 38 static_libs: [
50 "libsparse_static", 39 "libsparse",
51 "libz", 40 "libz",
52 ], 41 ],
53 42
@@ -59,7 +48,7 @@ cc_binary {
59 host_supported: true, 48 host_supported: true,
60 srcs: ["img2simg.c"], 49 srcs: ["img2simg.c"],
61 static_libs: [ 50 static_libs: [
62 "libsparse_static", 51 "libsparse",
63 "libz", 52 "libz",
64 ], 53 ],
65 54
@@ -70,7 +59,7 @@ cc_binary_host {
70 name: "append2simg", 59 name: "append2simg",
71 srcs: ["append2simg.c"], 60 srcs: ["append2simg.c"],
72 static_libs: [ 61 static_libs: [
73 "libsparse_static", 62 "libsparse",
74 "libz", 63 "libz",
75 ], 64 ],
76 65