Merge "Add toolbox to vendor" am: ea4c7d5727
am: e575b4830c
Change-Id: I5caafa6fca1b70b18a16da4bd501beab21fa8380
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 3fd7fde..02365c6 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",
@@ -40,8 +41,8 @@
out: ["input.h-labels.h"],
}
-cc_binary {
- name: "toolbox",
+cc_defaults {
+ name: "toolbox_binary_defaults",
defaults: ["toolbox_defaults"],
srcs: [
"toolbox.c",
@@ -63,6 +64,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",