commit 218f65628efe3d15fe788eeaf2bf7a639daeb0ca
author Dan Willemsen <dwillemsen@google.com> Wed Jul 08 18:13:11 2015 -0700
committer Colin Cross <ccross@android.com> Tue Dec 01 15:08:01 2015 -0800
tree 60d962e024387e57930b21fa0cb9ef9a9d5c61e4
parent 979422c6c2d85b8048b0a9a478b1ee0d6a54eeed

Hybrid soong/mk build using prebuilts

Change-Id: I96daa69af27bd19c8bfbe327a1318f51c738fc03

Android.bp

diff --git a/Android.bp b/Android.bp
index 9a7beb8..52bdc7c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -89,6 +89,7 @@
         "soong-glob",
     ],
     srcs: [
+        "common/androidmk.go",
         "common/arch.go",
         "common/config.go",
         "common/defaults.go",
@@ -114,6 +115,7 @@
         "soong-genrule",
     ],
     srcs: [
+        "cc/androidmk.go",
         "cc/builder.go",
         "cc/cc.go",
         "cc/clang.go",
@@ -171,6 +173,7 @@
         "soong-genrule",
     ],
     srcs: [
+        "java/androidmk.go",
         "java/app_builder.go",
         "java/app.go",
         "java/builder.go",