From 2bb70d31ee7749b18b5e0e5ce50a12d30bc1f27c Mon Sep 17 00:00:00 2001 From: Igor Murashkin Date: Mon, 6 Feb 2017 10:34:14 -0800 Subject: Revert "Revert "build: Generate asm_support_gen.h from the build, validate up-to-date"" This reverts commit 592505c340e82091a6e13e2dff3d8589255df0bb. Fix HOST_PREFER_32_BIT=true causing buildbot to fail with the new asm_support genrule. Test: SOONG_ALLOW_MISSING_DEPENDENCIES=true HOST_PREFER_32_BIT=true\ make -j32 build-art-host-tests Original-Change-Id: I1f0f94914d328c396906583d0732e281c076e69f Change-Id: Ie08a11fdb9486b697d6cef4cec41b23ff120b205 --- tools/cpp-define-generator/Android.bp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'tools/cpp-define-generator/Android.bp') diff --git a/tools/cpp-define-generator/Android.bp b/tools/cpp-define-generator/Android.bp index d792e906ef..59c52117eb 100644 --- a/tools/cpp-define-generator/Android.bp +++ b/tools/cpp-define-generator/Android.bp @@ -20,7 +20,7 @@ // // In the future we may wish to parameterize this on (32,64)x(read_barrier,no_read_barrier). -art_cc_binary { +cc_binary { // Do not use art_cc_binary because HOST_PREFER_32_BIT is incompatible with genrule. name: "cpp-define-generator-data", host_supported: true, device_supported: false, @@ -34,3 +34,14 @@ art_cc_binary { "libbase", ], } + +// Note: See $OUT_DIR/soong/build.ninja +// For the exact filename that this generates to run make command on just +// this rule later. +genrule { + name: "cpp-define-generator-asm-support", + out: ["asm_support_gen.h"], + tools: ["cpp-define-generator-data"], + tool_files: ["verify-asm-support"], + cmd: "$(location verify-asm-support) --quiet \"$(location cpp-define-generator-data)\" \"$(out)\"" +} -- cgit v1.2.3-59-g8ed1b