Add toolbox to vendor
In preparation for adding getprop to toolbox
Test: toolbox is present in vendor
Change-Id: I8f2f7f8359902e84c14cc0c4adf349475d1d7aa7
diff --git a/shell_and_utilities/Android.bp b/shell_and_utilities/Android.bp
index 4203db4..3ccb92f 100644
--- a/shell_and_utilities/Android.bp
+++ b/shell_and_utilities/Android.bp
@@ -12,6 +12,7 @@
"sh",
"sh_vendor",
"toolbox",
+ "toolbox_vendor",
"toybox",
"toybox_vendor",
],
diff --git a/toolbox/Android.bp b/toolbox/Android.bp
index b5d16b8..80a1148 100644
--- a/toolbox/Android.bp
+++ b/toolbox/Android.bp
@@ -13,6 +13,7 @@
cc_library_static {
name: "libtoolbox_dd",
defaults: ["toolbox_defaults"],
+ vendor_available: true,
srcs: [
"upstream-netbsd/bin/dd/args.c",
"upstream-netbsd/bin/dd/conv.c",
@@ -46,8 +47,8 @@
out: ["input.h-labels.h"],
}
-cc_binary {
- name: "toolbox",
+cc_defaults {
+ name: "toolbox_binary_defaults",
defaults: ["toolbox_defaults"],
srcs: [
"toolbox.c",
@@ -70,6 +71,18 @@
],
}
+cc_binary {
+ name: "toolbox",
+ defaults: ["toolbox_binary_defaults"],
+}
+
+cc_binary {
+ name: "toolbox_vendor",
+ stem: "toolbox",
+ vendor: true,
+ defaults: ["toolbox_binary_defaults"],
+}
+
// We only want 'r' on userdebug and eng builds.
cc_binary {
name: "r",