diff options
| author | 2016-08-02 02:07:19 +0000 | |
|---|---|---|
| committer | 2016-08-02 02:07:19 +0000 | |
| commit | 1a827a05afbffd5bee241f245f9aa3c40b4dbae4 (patch) | |
| tree | 4c33e4b82276b11cb1d5b6167695ec8c6ed037b0 | |
| parent | 8bf927b5c220579f8b5f89d7fe5639d88d03eb89 (diff) | |
| parent | 6ab52837141951f2b324896a20a182017953a5e3 (diff) | |
Merge "Revert "cpp-define-generator: "make art-update-cpp-defines" to regen asm_support""
| -rw-r--r-- | Android.mk | 1 | ||||
| -rw-r--r-- | runtime/generated/asm_support_gen.h | 1 | ||||
| -rw-r--r-- | tools/cpp-define-generator/Android.mk | 6 | ||||
| -rw-r--r-- | tools/cpp-define-generator/main.cc | 1 |
4 files changed, 0 insertions, 9 deletions
diff --git a/Android.mk b/Android.mk index ddadbacd7e..4ff857bae1 100644 --- a/Android.mk +++ b/Android.mk @@ -90,7 +90,6 @@ 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 a892eab984..f1a32569e1 100644 --- a/runtime/generated/asm_support_gen.h +++ b/runtime/generated/asm_support_gen.h @@ -19,7 +19,6 @@ #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 4ed6f104b7..6ba643cd81 100644 --- a/tools/cpp-define-generator/Android.mk +++ b/tools/cpp-define-generator/Android.mk @@ -32,9 +32,3 @@ 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 46b2a37b71..a1b463a92d 100644 --- a/tools/cpp-define-generator/main.cc +++ b/tools/cpp-define-generator/main.cc @@ -89,7 +89,6 @@ 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( |