summaryrefslogtreecommitdiff
path: root/compiler
diff options
context:
space:
mode:
author David Sehr <sehr@google.com> 2018-02-21 13:20:31 -0800
committer David Sehr <sehr@google.com> 2018-02-21 13:51:15 -0800
commitb2ec9f5c128673c43f776cbe12c8eeb0a6884ebb (patch)
tree724022162a4f3de021cebab32ee5ac67ec860f32 /compiler
parentf13343eb8b2738e2812fd7bd9d5592f529e93c21 (diff)
Remove duplication, split tests
The code move to libdexfile/dex/descriptors_names.cc apparently did not remove the original code from runtime/utils.cc. Fix that duplication and all the header mentions needed. Also, split the test files to go along with the new locations for the code to be tested. Bug: 22322814 Test: make -j 50 checkbuild make -j 50 test-art-host-gtest flash & boot marlin Change-Id: Ie734672c4bca2c647d8016291f910b5608674545
Diffstat (limited to 'compiler')
-rw-r--r--compiler/common_compiler_test.cc1
-rw-r--r--compiler/driver/compiler_driver.cc1
-rw-r--r--compiler/driver/dex_compilation_unit.cc1
-rw-r--r--compiler/optimizing/graph_visualizer.cc1
4 files changed, 4 insertions, 0 deletions
diff --git a/compiler/common_compiler_test.cc b/compiler/common_compiler_test.cc
index 40a5370ec7..a20313374c 100644
--- a/compiler/common_compiler_test.cc
+++ b/compiler/common_compiler_test.cc
@@ -23,6 +23,7 @@
#include "base/enums.h"
#include "class_linker.h"
#include "compiled_method-inl.h"
+#include "dex/descriptors_names.h"
#include "dex/quick_compiler_callbacks.h"
#include "dex/verification_results.h"
#include "driver/compiler_driver.h"
diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc
index fb428b8d9a..a6681ec1ef 100644
--- a/compiler/driver/compiler_driver.cc
+++ b/compiler/driver/compiler_driver.cc
@@ -42,6 +42,7 @@
#include "compiler.h"
#include "compiler_callbacks.h"
#include "compiler_driver-inl.h"
+#include "dex/descriptors_names.h"
#include "dex/dex_file-inl.h"
#include "dex/dex_file_annotations.h"
#include "dex/dex_instruction-inl.h"
diff --git a/compiler/driver/dex_compilation_unit.cc b/compiler/driver/dex_compilation_unit.cc
index 28e68c94df..2e315b5d12 100644
--- a/compiler/driver/dex_compilation_unit.cc
+++ b/compiler/driver/dex_compilation_unit.cc
@@ -17,6 +17,7 @@
#include "dex_compilation_unit.h"
#include "dex/code_item_accessors-inl.h"
+#include "dex/descriptors_names.h"
#include "mirror/dex_cache.h"
#include "utils.h"
diff --git a/compiler/optimizing/graph_visualizer.cc b/compiler/optimizing/graph_visualizer.cc
index bbf8c26d59..5ff31cead5 100644
--- a/compiler/optimizing/graph_visualizer.cc
+++ b/compiler/optimizing/graph_visualizer.cc
@@ -27,6 +27,7 @@
#include "code_generator.h"
#include "data_type-inl.h"
#include "dead_code_elimination.h"
+#include "dex/descriptors_names.h"
#include "disassembler.h"
#include "inliner.h"
#include "licm.h"