diff options
| author | 2018-01-24 19:08:50 +0000 | |
|---|---|---|
| committer | 2018-01-24 19:08:50 +0000 | |
| commit | d02784e17c20c91a50dcb10522351f4937e250ff (patch) | |
| tree | 2cf70f14f13f0126397b6f35c7cd51a94c88954d /tools/cpp-define-generator | |
| parent | e65febd52f8d8af3d693dd36042ce769375c3b9e (diff) | |
| parent | 8c0961f9e061ee4b04c1c4ba8ad5cca13bcf884d (diff) | |
Merge "Move missed files to libdexfile"
Diffstat (limited to 'tools/cpp-define-generator')
| -rw-r--r-- | tools/cpp-define-generator/constant_class.def | 2 | ||||
| -rw-r--r-- | tools/cpp-define-generator/constant_globals.def | 2 |
2 files changed, 2 insertions, 2 deletions
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 <atomic> // 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) |