cpp-define-generator: "make art-update-cpp-defines" to regen asm_support

Change-Id: I1a550eda6c77f38e63bb1c8fb943541cbd3f9cdf

diff --git a/Android.mk b/Android.mk
index 4ff857b..ddadbac 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -90,6 +90,7 @@ include $(art_path)/profman/Android.mk
 include $(art_path)/dalvikvm/Android.mk
 include $(art_path)/tools/Android.mk
 include $(art_path)/tools/ahat/Android.mk
+include $(art_path)/tools/cpp-define-generator/Android.mk
 include $(art_path)/tools/dexfuzz/Android.mk
 include $(art_path)/tools/dmtracedump/Android.mk
 include $(art_path)/sigchainlib/Android.mk

diff --git a/runtime/generated/asm_support_gen.h b/runtime/generated/asm_support_gen.h
index f1a3256..a892eab 100644 (file)
--- a/runtime/generated/asm_support_gen.h
+++ b/runtime/generated/asm_support_gen.h
@@ -19,6 +19,7 @@
 #define ART_RUNTIME_GENERATED_ASM_SUPPORT_GEN_H_
 
 // This file has been auto-generated by cpp-define-generator; do not edit directly.
+// To re-generate, run "make art-update-cpp-defines"
 
 #define STACK_REFERENCE_SIZE 0x4
 DEFINE_CHECK_EQ(static_cast<size_t>(STACK_REFERENCE_SIZE), (static_cast<size_t>(sizeof(art::StackReference<art::mirror::Object>))))

diff --git a/tools/cpp-define-generator/Android.mk b/tools/cpp-define-generator/Android.mk
index 6ba643c..4ed6f10 100644 (file)
--- a/tools/cpp-define-generator/Android.mk
+++ b/tools/cpp-define-generator/Android.mk
@@ -32,3 +32,9 @@ CPP_DEFINE_GENERATOR_MULTILIB :=
 # In the future we may wish to parameterize this on (32,64)x(read_barrier,no_read_barrier).
 $(eval $(call build-art-executable,cpp-define-generator-data,$(CPP_DEFINE_GENERATOR_SRC_FILES),$(CPP_DEFINE_GENERATOR_EXTRA_SHARED_LIBRARIES),$(CPP_DEFINE_GENERATOR_EXTRA_INCLUDE),host,debug,$(CPP_DEFINE_GENERATOR_MULTILIB),shared))
 
+#####################
+#####################
+.PHONY: art-update-cpp-defines
+art-update-cpp-defines: cpp-define-generator-datad
+       art/tools/cpp-define-generator/generate-asm-support
+

diff --git a/tools/cpp-define-generator/main.cc b/tools/cpp-define-generator/main.cc
index a1b463a..46b2a37 100644 (file)
--- a/tools/cpp-define-generator/main.cc
+++ b/tools/cpp-define-generator/main.cc
@@ -89,6 +89,7 @@ const char *kFileHeader = /* // NOLINT [readability/multiline_string] [5] */ R"L
 #define ART_RUNTIME_GENERATED_ASM_SUPPORT_GEN_H_
 
 // This file has been auto-generated by cpp-define-generator; do not edit directly.
+// To re-generate, run "make art-update-cpp-defines"
 )L1C3NS3";  // NOLINT [readability/multiline_string] [5]
 
 const char *kFileFooter = /* // NOLINT [readability/multiline_string] [5] */ R"F00T3R(