Snap for 11962796 from b29ed51838737f0c8d0c689c50147e9bc128a31e to sdk-releasesdk-releasebusytown-mac-infra-release

Change-Id: I0b3a731878600062f322358af0791a9b1c5747b0

1 files changed, 21 insertions, 4 deletions

diff --git a/Android.bp b/Android.bp
index 3f11b1e..f979aec 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,14 +12,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-cc_prebuilt_binary {
-    name: "cmake",
-    host_supported: true,
+cc_defaults {
+    name: "cmake_defaults",
 
+    host_supported: true,
     compile_multilib: "64",
-    prefer: true,
     enabled: false,
     check_elf_files: false,
+}
+
+cc_prebuilt_binary {
+    name: "cmake",
+    defaults: ["cmake_defaults"],
+
     target: {
         linux: {
             enabled: true,
@@ -28,6 +33,18 @@ cc_prebuilt_binary {
     },
 }
 
+cc_prebuilt_binary {
+    name: "ctest",
+    defaults: ["cmake_defaults"],
+
+    target: {
+        linux: {
+            enabled: true,
+            srcs: ["bin/ctest"],
+        },
+    },
+}
+
 filegroup {
     name: "cmake_root",
     srcs: [