diff --git a/cmd/soong_build/Android.bp b/cmd/soong_build/Android.bp
new file mode 100644
index 0000000..d9daafc
--- /dev/null
+++ b/cmd/soong_build/Android.bp
@@ -0,0 +1,29 @@
+// Copyright 2015 Google Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+bootstrap_go_binary {
+    name: "soong_build",
+    deps: [
+        "blueprint",
+        "blueprint-bootstrap",
+        "soong",
+        "soong-android",
+        "soong-env",
+    ],
+    srcs: [
+        "main.go",
+    ],
+    primaryBuilder: true,
+}
+
diff --git a/cmd/soong_env/Android.bp b/cmd/soong_env/Android.bp
new file mode 100644
index 0000000..b0d827c
--- /dev/null
+++ b/cmd/soong_env/Android.bp
@@ -0,0 +1,24 @@
+// Copyright 2015 Google Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+bootstrap_go_binary {
+    name: "soong_env",
+    deps: [
+        "soong-env",
+    ],
+    srcs: [
+        "soong_env.go",
+    ],
+}
+
diff --git a/cmd/soong_glob/Android.bp b/cmd/soong_glob/Android.bp
new file mode 100644
index 0000000..bd8a4a2
--- /dev/null
+++ b/cmd/soong_glob/Android.bp
@@ -0,0 +1,23 @@
+// Copyright 2015 Google Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+blueprint_go_binary {
+    name: "soong_glob",
+    deps: [
+        "soong-glob",
+    ],
+    srcs: [
+        "soong_glob.go",
+    ],
+}
diff --git a/cmd/soong_zip/Android.bp b/cmd/soong_zip/Android.bp
new file mode 100644
index 0000000..10896ce
--- /dev/null
+++ b/cmd/soong_zip/Android.bp
@@ -0,0 +1,22 @@
+// Copyright 2016 Google Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+blueprint_go_binary {
+    name: "soong_zip",
+    deps: ["android-archive-zip"],
+    srcs: [
+        "soong_zip.go",
+        "rate_limit.go",
+    ],
+}
diff --git a/cmd/zip2zip/Android.bp b/cmd/zip2zip/Android.bp
new file mode 100644
index 0000000..8cac003
--- /dev/null
+++ b/cmd/zip2zip/Android.bp
@@ -0,0 +1,22 @@
+// Copyright 2016 Google Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+blueprint_go_binary {
+    name: "zip2zip",
+    deps: ["android-archive-zip"],
+    srcs: [
+        "zip2zip.go",
+    ],
+}
+