From 8c0961f9e061ee4b04c1c4ba8ad5cca13bcf884d Mon Sep 17 00:00:00 2001 From: David Sehr Date: Tue, 23 Jan 2018 16:11:38 -0800 Subject: Move missed files to libdexfile Reduce the dependencies on utf and utils in preparation for separate directory. Bug: 22322814 Test: make -j 50 test-art-host make -j 50 dexdump2 dexlist Change-Id: Icdecf895dafec63ef903514eef79d459abc14925 --- tools/cpp-define-generator/constant_class.def | 2 +- tools/cpp-define-generator/constant_globals.def | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/cpp-define-generator') diff --git a/tools/cpp-define-generator/constant_class.def b/tools/cpp-define-generator/constant_class.def index 4f1d875e5a..1310103ab7 100644 --- a/tools/cpp-define-generator/constant_class.def +++ b/tools/cpp-define-generator/constant_class.def @@ -15,8 +15,8 @@ */ #if defined(DEFINE_INCLUDE_DEPENDENCIES) -#include "modifiers.h" // kAccClassIsFinalizable #include "base/bit_utils.h" // MostSignificantBit +#include "dex/modifiers.h" // kAccClassIsFinalizable #endif #define DEFINE_FLAG_OFFSET(type_name, field_name, expr) \ diff --git a/tools/cpp-define-generator/constant_globals.def b/tools/cpp-define-generator/constant_globals.def index 5018f52937..539633e0b3 100644 --- a/tools/cpp-define-generator/constant_globals.def +++ b/tools/cpp-define-generator/constant_globals.def @@ -18,8 +18,8 @@ #if defined(DEFINE_INCLUDE_DEPENDENCIES) #include // std::memory_order_relaxed +#include "dex/modifiers.h" #include "globals.h" // art::kObjectAlignment -#include "modifiers.h" #endif DEFINE_EXPR(STD_MEMORY_ORDER_RELAXED, int32_t, std::memory_order_relaxed) -- cgit v1.2.3-59-g8ed1b