Fix multiple inclusion guards to match new pathnames
Change-Id: Id7735be1d75bc315733b1773fba45c1deb8ace43
diff --git a/runtime/base/casts.h b/runtime/base/casts.h
index 34c05af..be94c2e 100644
--- a/runtime/base/casts.h
+++ b/runtime/base/casts.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_BASE_CASTS_H_
-#define ART_SRC_BASE_CASTS_H_
+#ifndef ART_RUNTIME_BASE_CASTS_H_
+#define ART_RUNTIME_BASE_CASTS_H_
#include <assert.h>
#include <string.h>
@@ -90,4 +90,4 @@
} // namespace art
-#endif // ART_SRC_BASE_CASTS_H_
+#endif // ART_RUNTIME_BASE_CASTS_H_
diff --git a/runtime/base/histogram-inl.h b/runtime/base/histogram-inl.h
index 9514209..bbca603 100644
--- a/runtime/base/histogram-inl.h
+++ b/runtime/base/histogram-inl.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef SRC_BASE_HISTOGRAM_INL_H_
-#define SRC_BASE_HISTOGRAM_INL_H_
+#ifndef ART_RUNTIME_BASE_HISTOGRAM_INL_H_
+#define ART_RUNTIME_BASE_HISTOGRAM_INL_H_
#include "histogram.h"
@@ -251,5 +251,5 @@
}
} // namespace art
-#endif // SRC_BASE_HISTOGRAM_INL_H_
+#endif // ART_RUNTIME_BASE_HISTOGRAM_INL_H_
diff --git a/runtime/base/histogram.h b/runtime/base/histogram.h
index 6878e71..8724d2c 100644
--- a/runtime/base/histogram.h
+++ b/runtime/base/histogram.h
@@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#ifndef ART_SRC_BASE_HISTOGRAM_H_
-#define ART_SRC_BASE_HISTOGRAM_H_
+#ifndef ART_RUNTIME_BASE_HISTOGRAM_H_
+#define ART_RUNTIME_BASE_HISTOGRAM_H_
#include <vector>
#include <string>
@@ -117,4 +117,4 @@
};
}
-#endif // ART_SRC_BASE_HISTOGRAM_H_
+#endif // ART_RUNTIME_BASE_HISTOGRAM_H_
diff --git a/runtime/base/logging.h b/runtime/base/logging.h
index 8d89e4d..f02a39a 100644
--- a/runtime/base/logging.h
+++ b/runtime/base/logging.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_BASE_LOGGING_H_
-#define ART_SRC_BASE_LOGGING_H_
+#ifndef ART_RUNTIME_BASE_LOGGING_H_
+#define ART_RUNTIME_BASE_LOGGING_H_
#include <cerrno>
#include <cstring>
@@ -334,4 +334,4 @@
} // namespace art
-#endif // ART_SRC_BASE_LOGGING_H_
+#endif // ART_RUNTIME_BASE_LOGGING_H_
diff --git a/runtime/base/macros.h b/runtime/base/macros.h
index 847105d..4a196f2 100644
--- a/runtime/base/macros.h
+++ b/runtime/base/macros.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_BASE_MACROS_H_
-#define ART_SRC_BASE_MACROS_H_
+#ifndef ART_RUNTIME_BASE_MACROS_H_
+#define ART_RUNTIME_BASE_MACROS_H_
#include <stddef.h> // for size_t
@@ -198,4 +198,4 @@
#endif // defined(__SUPPORT_TS_ANNOTATION__)
-#endif // ART_SRC_BASE_MACROS_H_
+#endif // ART_RUNTIME_BASE_MACROS_H_
diff --git a/runtime/base/mutex-inl.h b/runtime/base/mutex-inl.h
index f911054..07157da 100644
--- a/runtime/base/mutex-inl.h
+++ b/runtime/base/mutex-inl.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_BASE_MUTEX_INL_H_
-#define ART_SRC_BASE_MUTEX_INL_H_
+#ifndef ART_RUNTIME_BASE_MUTEX_INL_H_
+#define ART_RUNTIME_BASE_MUTEX_INL_H_
#include "mutex.h"
@@ -184,4 +184,4 @@
} // namespace art
-#endif // ART_SRC_BASE_MUTEX_INL_H_
+#endif // ART_RUNTIME_BASE_MUTEX_INL_H_
diff --git a/runtime/base/mutex.h b/runtime/base/mutex.h
index b627559..dea52a6 100644
--- a/runtime/base/mutex.h
+++ b/runtime/base/mutex.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_BASE_MUTEX_H_
-#define ART_SRC_BASE_MUTEX_H_
+#ifndef ART_RUNTIME_BASE_MUTEX_H_
+#define ART_RUNTIME_BASE_MUTEX_H_
#include <pthread.h>
#include <stdint.h>
@@ -398,4 +398,4 @@
} // namespace art
-#endif // ART_SRC_BASE_MUTEX_H_
+#endif // ART_RUNTIME_BASE_MUTEX_H_
diff --git a/runtime/base/stl_util.h b/runtime/base/stl_util.h
index eb8be42..ff9f40c 100644
--- a/runtime/base/stl_util.h
+++ b/runtime/base/stl_util.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_BASE_STL_UTIL_H_
-#define ART_SRC_BASE_STL_UTIL_H_
+#ifndef ART_RUNTIME_BASE_STL_UTIL_H_
+#define ART_RUNTIME_BASE_STL_UTIL_H_
#include <algorithm>
#include <sstream>
@@ -94,4 +94,4 @@
} // namespace art
-#endif // ART_SRC_BASE_STL_UTIL_H_
+#endif // ART_RUNTIME_BASE_STL_UTIL_H_
diff --git a/runtime/base/stringpiece.h b/runtime/base/stringpiece.h
index 3664218..62088cc 100644
--- a/runtime/base/stringpiece.h
+++ b/runtime/base/stringpiece.h
@@ -25,8 +25,8 @@
// Systematic usage of StringPiece is encouraged as it will reduce unnecessary
// conversions from "const char*" to "string" and back again.
-#ifndef ART_SRC_BASE_STRINGPIECE_H_
-#define ART_SRC_BASE_STRINGPIECE_H_
+#ifndef ART_RUNTIME_BASE_STRINGPIECE_H_
+#define ART_RUNTIME_BASE_STRINGPIECE_H_
#include <string.h>
#include <algorithm>
@@ -223,4 +223,4 @@
} // namespace art
-#endif // ART_SRC_BASE_STRINGPIECE_H_
+#endif // ART_RUNTIME_BASE_STRINGPIECE_H_
diff --git a/runtime/base/stringprintf.h b/runtime/base/stringprintf.h
index d707cc0..4767a75 100644
--- a/runtime/base/stringprintf.h
+++ b/runtime/base/stringprintf.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_BASE_STRINGPRINTF_H_
-#define ART_SRC_BASE_STRINGPRINTF_H_
+#ifndef ART_RUNTIME_BASE_STRINGPRINTF_H_
+#define ART_RUNTIME_BASE_STRINGPRINTF_H_
#include <stdarg.h>
#include <string>
@@ -35,4 +35,4 @@
} // namespace art
-#endif // ART_SRC_BASE_STRINGPRINTF_H_
+#endif // ART_RUNTIME_BASE_STRINGPRINTF_H_
diff --git a/runtime/base/timing_logger.h b/runtime/base/timing_logger.h
index 65732b1..816cbea 100644
--- a/runtime/base/timing_logger.h
+++ b/runtime/base/timing_logger.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_SRC_TIMING_LOGGER_H_
-#define ART_SRC_TIMING_LOGGER_H_
+#ifndef ART_RUNTIME_BASE_TIMING_LOGGER_H_
+#define ART_RUNTIME_BASE_TIMING_LOGGER_H_
#include "base/histogram.h"
#include "base/macros.h"
@@ -139,4 +139,4 @@
} // namespace base
} // namespace art
-#endif // ART_SRC_TIMING_LOGGER_H_
+#endif // ART_RUNTIME_BASE_TIMING_LOGGER_H_
diff --git a/runtime/base/unix_file/fd_file.h b/runtime/base/unix_file/fd_file.h
index 2b33961..79a0db9 100644
--- a/runtime/base/unix_file/fd_file.h
+++ b/runtime/base/unix_file/fd_file.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef BASE_UNIX_FILE_FD_FILE_H_
-#define BASE_UNIX_FILE_FD_FILE_H_
+#ifndef ART_RUNTIME_BASE_UNIX_FILE_FD_FILE_H_
+#define ART_RUNTIME_BASE_UNIX_FILE_FD_FILE_H_
#include <fcntl.h>
#include <string>
@@ -72,4 +72,4 @@
} // namespace unix_file
-#endif // BASE_UNIX_FILE_FD_FILE_H_
+#endif // ART_RUNTIME_BASE_UNIX_FILE_FD_FILE_H_
diff --git a/runtime/base/unix_file/mapped_file.h b/runtime/base/unix_file/mapped_file.h
index 161100b..28cc551 100644
--- a/runtime/base/unix_file/mapped_file.h
+++ b/runtime/base/unix_file/mapped_file.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef BASE_UNIX_FILE_MAPPED_FILE_H_
-#define BASE_UNIX_FILE_MAPPED_FILE_H_
+#ifndef ART_RUNTIME_BASE_UNIX_FILE_MAPPED_FILE_H_
+#define ART_RUNTIME_BASE_UNIX_FILE_MAPPED_FILE_H_
#include <fcntl.h>
#include <string>
@@ -94,4 +94,4 @@
} // namespace unix_file
-#endif // BASE_UNIX_FILE_MAPPED_FILE_H_
+#endif // ART_RUNTIME_BASE_UNIX_FILE_MAPPED_FILE_H_
diff --git a/runtime/base/unix_file/null_file.h b/runtime/base/unix_file/null_file.h
index e716603..3394731 100644
--- a/runtime/base/unix_file/null_file.h
+++ b/runtime/base/unix_file/null_file.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef BASE_UNIX_FILE_NULL_FILE_H_
-#define BASE_UNIX_FILE_NULL_FILE_H_
+#ifndef ART_RUNTIME_BASE_UNIX_FILE_NULL_FILE_H_
+#define ART_RUNTIME_BASE_UNIX_FILE_NULL_FILE_H_
#include "base/unix_file/random_access_file.h"
#include "base/macros.h"
@@ -47,4 +47,4 @@
} // namespace unix_file
-#endif // BASE_UNIX_FILE_NULL_FILE_H_
+#endif // ART_RUNTIME_BASE_UNIX_FILE_NULL_FILE_H_
diff --git a/runtime/base/unix_file/random_access_file.h b/runtime/base/unix_file/random_access_file.h
index 22da37f..31a6dbe 100644
--- a/runtime/base/unix_file/random_access_file.h
+++ b/runtime/base/unix_file/random_access_file.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef BASE_UNIX_FILE_RANDOM_ACCESS_FILE_H_
-#define BASE_UNIX_FILE_RANDOM_ACCESS_FILE_H_
+#ifndef ART_RUNTIME_BASE_UNIX_FILE_RANDOM_ACCESS_FILE_H_
+#define ART_RUNTIME_BASE_UNIX_FILE_RANDOM_ACCESS_FILE_H_
#include <stdint.h>
@@ -65,4 +65,4 @@
} // namespace unix_file
-#endif // BASE_UNIX_FILE_RANDOM_ACCESS_FILE_H_
+#endif // ART_RUNTIME_BASE_UNIX_FILE_RANDOM_ACCESS_FILE_H_
diff --git a/runtime/base/unix_file/random_access_file_test.h b/runtime/base/unix_file/random_access_file_test.h
index 3baaeae..9d8550d 100644
--- a/runtime/base/unix_file/random_access_file_test.h
+++ b/runtime/base/unix_file/random_access_file_test.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef BASE_UNIX_FILE_RANDOM_ACCESS_FILE_TEST_H_
-#define BASE_UNIX_FILE_RANDOM_ACCESS_FILE_TEST_H_
+#ifndef ART_RUNTIME_BASE_UNIX_FILE_RANDOM_ACCESS_FILE_TEST_H_
+#define ART_RUNTIME_BASE_UNIX_FILE_RANDOM_ACCESS_FILE_TEST_H_
#include <errno.h>
@@ -169,4 +169,4 @@
} // namespace unix_file
-#endif // BASE_UNIX_FILE_RANDOM_ACCESS_FILE_TEST_H_
+#endif // ART_RUNTIME_BASE_UNIX_FILE_RANDOM_ACCESS_FILE_TEST_H_
diff --git a/runtime/base/unix_file/random_access_file_utils.h b/runtime/base/unix_file/random_access_file_utils.h
index 0535ead..30c81c0 100644
--- a/runtime/base/unix_file/random_access_file_utils.h
+++ b/runtime/base/unix_file/random_access_file_utils.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef BASE_UNIX_FILE_RANDOM_ACCESS_FILE_UTILS_H_
-#define BASE_UNIX_FILE_RANDOM_ACCESS_FILE_UTILS_H_
+#ifndef ART_RUNTIME_BASE_UNIX_FILE_RANDOM_ACCESS_FILE_UTILS_H_
+#define ART_RUNTIME_BASE_UNIX_FILE_RANDOM_ACCESS_FILE_UTILS_H_
namespace unix_file {
@@ -27,4 +27,4 @@
} // namespace unix_file
-#endif // BASE_UNIX_FILE_RANDOM_ACCESS_FILE_UTILS_H_
+#endif // ART_RUNTIME_BASE_UNIX_FILE_RANDOM_ACCESS_FILE_UTILS_H_
diff --git a/runtime/base/unix_file/string_file.h b/runtime/base/unix_file/string_file.h
index 8944373..26904f8 100644
--- a/runtime/base/unix_file/string_file.h
+++ b/runtime/base/unix_file/string_file.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef BASE_UNIX_FILE_STRING_FILE_H_
-#define BASE_UNIX_FILE_STRING_FILE_H_
+#ifndef ART_RUNTIME_BASE_UNIX_FILE_STRING_FILE_H_
+#define ART_RUNTIME_BASE_UNIX_FILE_STRING_FILE_H_
#include <stdint.h>
@@ -56,4 +56,4 @@
} // namespace unix_file
-#endif // BASE_UNIX_FILE_STRING_FILE_H_
+#endif // ART_RUNTIME_BASE_UNIX_FILE_STRING_FILE_H_