summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Cherry2018-01-10 12:14:17 -0600
committerGerrit Code Review2018-01-10 12:14:17 -0600
commitea4c7d572750597c864b13c180ae6f9903a02c02 (patch)
treebce5a3b541a27fad5d43f22e13fa6f59fe49e604 /toolbox
parente0fc36c47bdff1a4d69a6ba16dbc3ad277899b82 (diff)
parent6fb3dcaa5ffb3749140aaf92e8a98f804611cb06 (diff)
downloadplatform-system-core-ea4c7d572750597c864b13c180ae6f9903a02c02.tar.gz
platform-system-core-ea4c7d572750597c864b13c180ae6f9903a02c02.tar.xz
platform-system-core-ea4c7d572750597c864b13c180ae6f9903a02c02.zip
Merge "Add toolbox to vendor"
Diffstat (limited to 'toolbox')
-rw-r--r--toolbox/Android.bp17
1 files changed, 15 insertions, 2 deletions
diff --git a/toolbox/Android.bp b/toolbox/Android.bp
index 3fd7fdefa..02365c600 100644
--- a/toolbox/Android.bp
+++ b/toolbox/Android.bp
@@ -13,6 +13,7 @@ cc_defaults {
13cc_library_static { 13cc_library_static {
14 name: "libtoolbox_dd", 14 name: "libtoolbox_dd",
15 defaults: ["toolbox_defaults"], 15 defaults: ["toolbox_defaults"],
16 vendor_available: true,
16 srcs: [ 17 srcs: [
17 "upstream-netbsd/bin/dd/args.c", 18 "upstream-netbsd/bin/dd/args.c",
18 "upstream-netbsd/bin/dd/conv.c", 19 "upstream-netbsd/bin/dd/conv.c",
@@ -40,8 +41,8 @@ genrule {
40 out: ["input.h-labels.h"], 41 out: ["input.h-labels.h"],
41} 42}
42 43
43cc_binary { 44cc_defaults {
44 name: "toolbox", 45 name: "toolbox_binary_defaults",
45 defaults: ["toolbox_defaults"], 46 defaults: ["toolbox_defaults"],
46 srcs: [ 47 srcs: [
47 "toolbox.c", 48 "toolbox.c",
@@ -63,6 +64,18 @@ cc_binary {
63 ], 64 ],
64} 65}
65 66
67cc_binary {
68 name: "toolbox",
69 defaults: ["toolbox_binary_defaults"],
70}
71
72cc_binary {
73 name: "toolbox_vendor",
74 stem: "toolbox",
75 vendor: true,
76 defaults: ["toolbox_binary_defaults"],
77}
78
66// We only want 'r' on userdebug and eng builds. 79// We only want 'r' on userdebug and eng builds.
67cc_binary { 80cc_binary {
68 name: "r", 81 name: "r",