From 38c3569011be2d654c34a9906129e92aaf941dec Mon Sep 17 00:00:00 2001 From: KongQun Yang Date: Thu, 28 Aug 2014 11:35:15 -0700 Subject: [PATCH] Use relative path for libxml and protobuf This is to remove dependency on Chromium directory layouts, to make it easier for integration. Change-Id: Idcdf31a517e50a9a689794a665b3e5e7c05e6c1f --- media/event/vod_media_info_dump_muxer_listener.cc | 3 ++- media/event/vod_media_info_dump_muxer_listener_unittest.cc | 2 +- mpd/base/mpd_builder.cc | 5 +++-- mpd/base/mpd_builder_unittest.cc | 2 +- mpd/base/mpd_utils.cc | 3 ++- mpd/base/mpd_utils.h | 3 ++- mpd/base/xml/scoped_xml_ptr.h | 5 +++-- mpd/base/xml/xml_node.h | 3 ++- mpd/base/xml/xml_node_unittest.cc | 2 +- mpd/test/mpd_builder_test_helper.cc | 2 +- mpd/test/xml_compare.cc | 3 ++- mpd/test/xml_compare.h | 4 ++-- mpd/util/mpd_writer.cc | 3 ++- 13 files changed, 24 insertions(+), 16 deletions(-) diff --git a/media/event/vod_media_info_dump_muxer_listener.cc b/media/event/vod_media_info_dump_muxer_listener.cc index e4c5a9380e..fbc899aff8 100644 --- a/media/event/vod_media_info_dump_muxer_listener.cc +++ b/media/event/vod_media_info_dump_muxer_listener.cc @@ -6,13 +6,14 @@ #include "media/event/vod_media_info_dump_muxer_listener.h" +#include + #include "base/logging.h" #include "media/base/muxer_options.h" #include "media/base/stream_info.h" #include "media/event/muxer_listener_internal.h" #include "media/file/file.h" #include "mpd/base/media_info.pb.h" -#include "third_party/protobuf/src/google/protobuf/text_format.h" namespace media { namespace event { diff --git a/media/event/vod_media_info_dump_muxer_listener_unittest.cc b/media/event/vod_media_info_dump_muxer_listener_unittest.cc index 8321e6bb6e..afbef13f8c 100644 --- a/media/event/vod_media_info_dump_muxer_listener_unittest.cc +++ b/media/event/vod_media_info_dump_muxer_listener_unittest.cc @@ -4,6 +4,7 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd +#include #include #include @@ -16,7 +17,6 @@ #include "media/base/muxer_options.h" #include "media/base/video_stream_info.h" #include "mpd/base/media_info.pb.h" -#include "third_party/protobuf/src/google/protobuf/text_format.h" using dash_packager::MediaInfo; diff --git a/mpd/base/mpd_builder.cc b/mpd/base/mpd_builder.cc index 86ace50c35..5d89327985 100644 --- a/mpd/base/mpd_builder.cc +++ b/mpd/base/mpd_builder.cc @@ -6,6 +6,9 @@ #include "mpd/base/mpd_builder.h" +#include +#include + #include #include #include @@ -19,8 +22,6 @@ #include "mpd/base/content_protection_element.h" #include "mpd/base/mpd_utils.h" #include "mpd/base/xml/xml_node.h" -#include "third_party/libxml/src/include/libxml/tree.h" -#include "third_party/libxml/src/include/libxml/xmlstring.h" namespace dash_packager { diff --git a/mpd/base/mpd_builder_unittest.cc b/mpd/base/mpd_builder_unittest.cc index f8e6d0d981..d1e433a153 100644 --- a/mpd/base/mpd_builder_unittest.cc +++ b/mpd/base/mpd_builder_unittest.cc @@ -6,6 +6,7 @@ #include #include +#include #include "base/file_util.h" #include "base/logging.h" @@ -17,7 +18,6 @@ #include "mpd/base/mpd_utils.h" #include "mpd/test/mpd_builder_test_helper.h" #include "mpd/test/xml_compare.h" -#include "third_party/libxml/src/include/libxml/xmlstring.h" namespace dash_packager { diff --git a/mpd/base/mpd_utils.cc b/mpd/base/mpd_utils.cc index cb599dd83c..e1f6918067 100644 --- a/mpd/base/mpd_utils.cc +++ b/mpd/base/mpd_utils.cc @@ -6,12 +6,13 @@ #include "mpd/base/mpd_utils.h" +#include + #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "mpd/base/content_protection_element.h" #include "mpd/base/media_info.pb.h" #include "mpd/base/xml/scoped_xml_ptr.h" -#include "third_party/libxml/src/include/libxml/tree.h" namespace { diff --git a/mpd/base/mpd_utils.h b/mpd/base/mpd_utils.h index f1b491a1f8..c4a76c6f54 100644 --- a/mpd/base/mpd_utils.h +++ b/mpd/base/mpd_utils.h @@ -9,10 +9,11 @@ #ifndef MPD_BASE_MPD_UTILS_H_ #define MPD_BASE_MPD_UTILS_H_ +#include + #include #include "base/basictypes.h" -#include "third_party/libxml/src/include/libxml/tree.h" namespace dash_packager { diff --git a/mpd/base/xml/scoped_xml_ptr.h b/mpd/base/xml/scoped_xml_ptr.h index 9589580629..c861c4ebdc 100644 --- a/mpd/base/xml/scoped_xml_ptr.h +++ b/mpd/base/xml/scoped_xml_ptr.h @@ -10,9 +10,10 @@ #ifndef MPD_BASE_XML_SCOPED_XML_PTR_H_ #define MPD_BASE_XML_SCOPED_XML_PTR_H_ +#include +#include + #include "base/memory/scoped_ptr.h" -#include "third_party/libxml/src/include/libxml/tree.h" -#include "third_party/libxml/src/include/libxml/xmlschemas.h" namespace dash_packager { namespace xml { diff --git a/mpd/base/xml/xml_node.h b/mpd/base/xml/xml_node.h index 10c073d6e9..2b89ca11ac 100644 --- a/mpd/base/xml/xml_node.h +++ b/mpd/base/xml/xml_node.h @@ -10,13 +10,14 @@ #ifndef MPD_BASE_XML_XML_NODE_H_ #define MPD_BASE_XML_XML_NODE_H_ +#include + #include #include "base/basictypes.h" #include "mpd/base/content_protection_element.h" #include "mpd/base/media_info.pb.h" #include "mpd/base/xml/scoped_xml_ptr.h" -#include "third_party/libxml/src/include/libxml/tree.h" namespace dash_packager { diff --git a/mpd/base/xml/xml_node_unittest.cc b/mpd/base/xml/xml_node_unittest.cc index f5aae7964f..314133e2ce 100644 --- a/mpd/base/xml/xml_node_unittest.cc +++ b/mpd/base/xml/xml_node_unittest.cc @@ -5,6 +5,7 @@ // https://developers.google.com/open-source/licenses/bsd #include +#include #include @@ -13,7 +14,6 @@ #include "mpd/base/mpd_builder.h" #include "mpd/base/xml/xml_node.h" #include "mpd/test/xml_compare.h" -#include "third_party/libxml/src/include/libxml/tree.h" namespace dash_packager { namespace xml { diff --git a/mpd/test/mpd_builder_test_helper.cc b/mpd/test/mpd_builder_test_helper.cc index 9d1b487450..896c575558 100644 --- a/mpd/test/mpd_builder_test_helper.cc +++ b/mpd/test/mpd_builder_test_helper.cc @@ -6,6 +6,7 @@ #include "mpd/test/mpd_builder_test_helper.h" +#include #include #include "base/file_util.h" @@ -14,7 +15,6 @@ #include "mpd/base/mpd_builder.h" #include "mpd/base/xml/scoped_xml_ptr.h" #include "mpd/test/xml_compare.h" -#include "third_party/protobuf/src/google/protobuf/text_format.h" namespace dash_packager { diff --git a/mpd/test/xml_compare.cc b/mpd/test/xml_compare.cc index fbfd67596d..53b10f4773 100644 --- a/mpd/test/xml_compare.cc +++ b/mpd/test/xml_compare.cc @@ -1,5 +1,7 @@ #include "mpd/test/xml_compare.h" +#include + #include #include #include @@ -7,7 +9,6 @@ #include "base/logging.h" #include "mpd/base/xml/scoped_xml_ptr.h" -#include "third_party/libxml/src/include/libxml/tree.h" namespace dash_packager { diff --git a/mpd/test/xml_compare.h b/mpd/test/xml_compare.h index 76ea4007aa..922d14ab22 100644 --- a/mpd/test/xml_compare.h +++ b/mpd/test/xml_compare.h @@ -1,9 +1,9 @@ #ifndef MPD_TEST_XML_COMPARE_H_ #define MPD_TEST_XML_COMPARE_H_ -#include +#include -#include "third_party/libxml/src/include/libxml/tree.h" +#include namespace dash_packager { diff --git a/mpd/util/mpd_writer.cc b/mpd/util/mpd_writer.cc index cdb56d0440..19739ed09b 100644 --- a/mpd/util/mpd_writer.cc +++ b/mpd/util/mpd_writer.cc @@ -6,10 +6,11 @@ #include "mpd/util/mpd_writer.h" +#include + #include "base/basictypes.h" #include "media/file/file.h" #include "mpd/base/mpd_builder.h" -#include "third_party/protobuf/src/google/protobuf/text_format.h" using media::File;