Rename Type.* to type_java.*
We'll soon have type_cpp variations on these files, and a more
generic type.h
Bug: 24303749
Test: Compiles, unittests
Change-Id: I64f45efa3553f1a46d2d16d6652eedd6b324b2e4
diff --git a/Android.mk b/Android.mk
index fc659d7..c56e0be 100644
--- a/Android.mk
+++ b/Android.mk
@@ -28,7 +28,6 @@
LOCAL_STATIC_LIBRARIES := $(aidl_static_libraries)
LOCAL_SRC_FILES := \
- Type.cpp \
aidl.cpp \
aidl_language.cpp \
aidl_language_l.l \
@@ -42,6 +41,7 @@
options.cpp \
parse_helpers.cpp \
search_path.cpp \
+ type_java.cpp \
include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/aidl.cpp b/aidl.cpp
index 58d088b..3c57e6a 100644
--- a/aidl.cpp
+++ b/aidl.cpp
@@ -33,7 +33,6 @@
#endif
-#include "Type.h"
#include "aidl_language.h"
#include "generate_cpp.h"
#include "generate_java.h"
@@ -42,6 +41,7 @@
#include "os.h"
#include "parse_helpers.h"
#include "search_path.h"
+#include "type_java.h"
#ifndef O_BINARY
# define O_BINARY 0
diff --git a/ast_java.cpp b/ast_java.cpp
index c91621e..e94ebfb 100644
--- a/ast_java.cpp
+++ b/ast_java.cpp
@@ -16,8 +16,8 @@
#include "ast_java.h"
-#include "Type.h"
#include "code_writer.h"
+#include "type_java.h"
namespace android {
namespace aidl {
diff --git a/ast_java_unittest.cpp b/ast_java_unittest.cpp
index 31dfb5a..ecf80c0 100644
--- a/ast_java_unittest.cpp
+++ b/ast_java_unittest.cpp
@@ -18,9 +18,9 @@
#include <gtest/gtest.h>
-#include "Type.h"
#include "ast_java.h"
#include "code_writer.h"
+#include "type_java.h"
namespace android {
namespace aidl {
diff --git a/generate_java.cpp b/generate_java.cpp
index 868783c..98f93bc 100644
--- a/generate_java.cpp
+++ b/generate_java.cpp
@@ -4,8 +4,8 @@
#include <stdlib.h>
#include <string.h>
-#include "Type.h"
#include "code_writer.h"
+#include "type_java.h"
namespace android {
namespace aidl {
diff --git a/generate_java_binder.cpp b/generate_java_binder.cpp
index f28c25b..60c0c12 100644
--- a/generate_java_binder.cpp
+++ b/generate_java_binder.cpp
@@ -5,8 +5,8 @@
#include <stdlib.h>
#include <string.h>
-#include "Type.h"
#include "parse_helpers.h"
+#include "type_java.h"
namespace android {
namespace aidl {
diff --git a/Type.cpp b/type_java.cpp
similarity index 97%
rename from Type.cpp
rename to type_java.cpp
index 7ae5757..02988f9 100644
--- a/Type.cpp
+++ b/type_java.cpp
@@ -1,4 +1,20 @@
-#include "Type.h"
+/*
+ * Copyright (C) 2015, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "type_java.h"
#include <sys/types.h>
diff --git a/Type.h b/type_java.h
similarity index 95%
rename from Type.h
rename to type_java.h
index a76d96e..0b3479d 100644
--- a/Type.h
+++ b/type_java.h
@@ -1,5 +1,21 @@
-#ifndef AIDL_TYPE_H_
-#define AIDL_TYPE_H_
+/*
+ * Copyright (C) 2015, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef AIDL_TYPE_JAVA_H_
+#define AIDL_TYPE_JAVA_H_
#include <string>
#include <vector>
@@ -442,4 +458,4 @@
} // namespace aidl
} // namespace android
-#endif // AIDL_TYPE_H_
+#endif // AIDL_TYPE_JAVA_H_