summaryrefslogtreecommitdiffstats
path: root/cmdline
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2017-08-23 09:43:46 -0700
committerAndreas Gampe <agampe@google.com>2017-08-23 16:06:00 -0700
commit3157fc26d96951ff4acfb4feb4597e74a92da2a7 (patch)
tree93c3a03a8eae4fc9f430531f25d8be3d4d8b5af7 /cmdline
parent27bd4dd81962b0e59df9318ae8efc83df99ebe0a (diff)
downloadart-3157fc26d96951ff4acfb4feb4597e74a92da2a7.tar.gz
art-3157fc26d96951ff4acfb4feb4597e74a92da2a7.tar.bz2
art-3157fc26d96951ff4acfb4feb4597e74a92da2a7.zip
ART: Move cmdline parser to header library
Express the cmdline parser as a header library. TODO: Express the libart dependency correctly. Test: m Change-Id: I9e90029d047ab0d75a455a2361d5213a8fa6f361
Diffstat (limited to 'cmdline')
-rw-r--r--cmdline/Android.bp7
-rw-r--r--cmdline/cmdline_parser.h8
2 files changed, 11 insertions, 4 deletions
diff --git a/cmdline/Android.bp b/cmdline/Android.bp
index c811cbdd33..b46e987972 100644
--- a/cmdline/Android.bp
+++ b/cmdline/Android.bp
@@ -14,6 +14,13 @@
// limitations under the License.
//
+// TODO: this header library depends on libart. Find a way to express that.
+cc_library_headers {
+ name: "art_cmdlineparser_headers",
+ host_supported: true,
+ export_include_dirs: ["."],
+}
+
art_cc_test {
name: "art_cmdline_tests",
defaults: [
diff --git a/cmdline/cmdline_parser.h b/cmdline/cmdline_parser.h
index 804727bdcd..fef39ad930 100644
--- a/cmdline/cmdline_parser.h
+++ b/cmdline/cmdline_parser.h
@@ -19,9 +19,9 @@
#define CMDLINE_NDEBUG 1 // Do not output any debugging information for parsing.
-#include "cmdline/detail/cmdline_debug_detail.h"
-#include "cmdline/detail/cmdline_parse_argument_detail.h"
-#include "cmdline/detail/cmdline_parser_detail.h"
+#include "detail/cmdline_debug_detail.h"
+#include "detail/cmdline_parse_argument_detail.h"
+#include "detail/cmdline_parser_detail.h"
#include "cmdline_parse_result.h"
#include "cmdline_result.h"
@@ -29,7 +29,7 @@
#include "cmdline_types.h"
#include "token_range.h"
-#include "runtime/base/variant_map.h"
+#include "base/variant_map.h"
#include <memory>
#include <vector>