diff options
44 files changed, 185 insertions, 66 deletions
diff --git a/src/check_jni.cc b/src/check_jni.cc index cc14935..67b1c3e 100644 --- a/src/check_jni.cc +++ b/src/check_jni.cc @@ -567,10 +567,10 @@ class ScopedCheck { enum InstanceKind { kClass, - kDirectByteBuffer, - kObject, - kString, - kThrowable, + kDirectByteBuffer, + kObject, + kString, + kThrowable, }; /* diff --git a/src/common_test.h b/src/common_test.h index e05a6d5..74056c9 100644 --- a/src/common_test.h +++ b/src/common_test.h @@ -20,15 +20,14 @@ #include <sys/stat.h> #include <sys/types.h> -#include "UniquePtr.h" #include "class_linker.h" #include "class_loader.h" #include "compiler.h" -#include "constants.h" #include "dex_file.h" #include "file.h" #include "gtest/gtest.h" #include "heap.h" +#include "instruction_set.h" #include "macros.h" #include "oat_file.h" #include "object_utils.h" @@ -39,6 +38,7 @@ #include "thread.h" #include "unicode/uclean.h" #include "unicode/uvernum.h" +#include "UniquePtr.h" namespace art { diff --git a/src/compiled_method.h b/src/compiled_method.h index d2c28a7..b98df39 100644 --- a/src/compiled_method.h +++ b/src/compiled_method.h @@ -19,7 +19,7 @@ #include <vector> -#include "constants.h" +#include "instruction_set.h" #include "utils.h" namespace llvm { diff --git a/src/compiler.h b/src/compiler.h index fcb9f7f..cb6023b 100644 --- a/src/compiler.h +++ b/src/compiler.h @@ -24,10 +24,11 @@ #include "compiled_class.h" #include "compiled_method.h" -#include "constants.h" #include "dex_cache.h" #include "dex_file.h" #include "elf_image.h" +#include "instruction_set.h" +#include "invoke_type.h" #include "oat_file.h" #include "object.h" #include "runtime.h" diff --git a/src/compiler/Frontend.cc b/src/compiler/Frontend.cc index 651087f..74c13d4 100644 --- a/src/compiler/Frontend.cc +++ b/src/compiler/Frontend.cc @@ -17,7 +17,6 @@ #include "Dalvik.h" #include "CompilerInternals.h" #include "Dataflow.h" -#include "constants.h" #include "leb128.h" #include "object.h" #include "runtime.h" diff --git a/src/compiler_llvm/compilation_unit.cc b/src/compiler_llvm/compilation_unit.cc index ae87395..c5952f0 100644 --- a/src/compiler_llvm/compilation_unit.cc +++ b/src/compiler_llvm/compilation_unit.cc @@ -16,7 +16,7 @@ #include "compilation_unit.h" -#include "constants.h" +#include "instruction_set.h" #include "ir_builder.h" #include "logging.h" diff --git a/src/compiler_llvm/compilation_unit.h b/src/compiler_llvm/compilation_unit.h index 57d559b..eb92ce4 100644 --- a/src/compiler_llvm/compilation_unit.h +++ b/src/compiler_llvm/compilation_unit.h @@ -17,9 +17,9 @@ #ifndef ART_SRC_COMPILER_LLVM_COMPILATION_UNIT_H_ #define ART_SRC_COMPILER_LLVM_COMPILATION_UNIT_H_ -#include "constants.h" #include "elf_image.h" #include "globals.h" +#include "instruction_set.h" #include "logging.h" #include <UniquePtr.h> diff --git a/src/compiler_llvm/compiler_llvm.h b/src/compiler_llvm/compiler_llvm.h index 2c37ac0..b9f8d00 100644 --- a/src/compiler_llvm/compiler_llvm.h +++ b/src/compiler_llvm/compiler_llvm.h @@ -18,9 +18,9 @@ #define ART_SRC_COMPILER_LLVM_COMPILER_LLVM_H_ #include "compiler.h" -#include "constants.h" #include "dex_file.h" #include "elf_image.h" +#include "instruction_set.h" #include "macros.h" #include "object.h" diff --git a/src/compiler_llvm/jni_compiler.h b/src/compiler_llvm/jni_compiler.h index 392c14d..c15dae5 100644 --- a/src/compiler_llvm/jni_compiler.h +++ b/src/compiler_llvm/jni_compiler.h @@ -17,8 +17,6 @@ #ifndef ART_SRC_COMPILER_LLVM_JNI_COMPILER_H_ #define ART_SRC_COMPILER_LLVM_JNI_COMPILER_H_ -#include "constants.h" - #include <stdint.h> namespace art { diff --git a/src/compiler_llvm/method_compiler.h b/src/compiler_llvm/method_compiler.h index 782b934..3127447 100644 --- a/src/compiler_llvm/method_compiler.h +++ b/src/compiler_llvm/method_compiler.h @@ -18,10 +18,10 @@ #define ART_SRC_COMPILER_LLVM_METHOD_COMPILER_H_ #include "backend_types.h" -#include "constants.h" #include "dalvik_reg.h" #include "dex_file.h" #include "dex_instruction.h" +#include "invoke_type.h" #include "object_utils.h" #include <llvm/Support/IRBuilder.h> diff --git a/src/compiler_llvm/runtime_support_llvm.cc b/src/compiler_llvm/runtime_support_llvm.cc index 02a201a..d929d3d 100644 --- a/src/compiler_llvm/runtime_support_llvm.cc +++ b/src/compiler_llvm/runtime_support_llvm.cc @@ -1,4 +1,18 @@ -// Copyright 2012 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2012 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 "class_linker.h" #include "dex_verifier.h" diff --git a/src/compiler_llvm/runtime_support_llvm.h b/src/compiler_llvm/runtime_support_llvm.h index b93138a..fb951ba 100644 --- a/src/compiler_llvm/runtime_support_llvm.h +++ b/src/compiler_llvm/runtime_support_llvm.h @@ -1,4 +1,18 @@ -// Copyright 2012 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2012 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 ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_LLVM_H_ #define ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_LLVM_H_ diff --git a/src/compiler_llvm/upcall_compiler.h b/src/compiler_llvm/upcall_compiler.h index c1e0afc..73d00a1 100644 --- a/src/compiler_llvm/upcall_compiler.h +++ b/src/compiler_llvm/upcall_compiler.h @@ -17,8 +17,6 @@ #ifndef ART_SRC_COMPILER_LLVM_UPCALL_COMPILER_H_ #define ART_SRC_COMPILER_LLVM_UPCALL_COMPILER_H_ -#include "constants.h" - #include <stdint.h> namespace art { diff --git a/src/constants.cc b/src/constants.cc index 65af2fb..12632eb 100644 --- a/src/constants.cc +++ b/src/constants.cc @@ -1,5 +1,5 @@ /* - * Copyright 2012 Google Inc. All Rights Reserved. + * Copyright (C) 2012 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. @@ -14,7 +14,12 @@ * limitations under the License. */ -#include "constants.h" +// TODO: automatically generate operator<<s for enum types. + +#include <iostream> + +#include "instruction_set.h" +#include "invoke_type.h" namespace art { diff --git a/src/disassembler.h b/src/disassembler.h index de9c8d1..bd745a8 100644 --- a/src/disassembler.h +++ b/src/disassembler.h @@ -17,7 +17,11 @@ #ifndef ART_SRC_DISASSEMBLER_H_ #define ART_SRC_DISASSEMBLER_H_ -#include "constants.h" +#include <stdint.h> + +#include <iosfwd> + +#include "instruction_set.h" namespace art { diff --git a/src/disassembler_arm.cc b/src/disassembler_arm.cc index aa7a39b..5211146 100644 --- a/src/disassembler_arm.cc +++ b/src/disassembler_arm.cc @@ -16,10 +16,11 @@ #include "disassembler_arm.h" -#include "stringprintf.h" - #include <iostream> +#include "logging.h" +#include "stringprintf.h" + namespace art { namespace arm { diff --git a/src/disassembler_x86.cc b/src/disassembler_x86.cc index 08025ea..4c8c09a 100644 --- a/src/disassembler_x86.cc +++ b/src/disassembler_x86.cc @@ -16,11 +16,11 @@ #include "disassembler_x86.h" -#include "stringprintf.h" - -#include <stdint.h> #include <iostream> +#include "logging.h" +#include "stringprintf.h" + namespace art { namespace x86 { diff --git a/src/instruction_set.h b/src/instruction_set.h new file mode 100644 index 0000000..c4dae4d --- /dev/null +++ b/src/instruction_set.h @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2011 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 ART_SRC_INSTRUCTION_SET_H_ +#define ART_SRC_INSTRUCTION_SET_H_ + +#include <iosfwd> + +namespace art { + +enum InstructionSet { + kNone, + kArm, + kThumb2, + kX86, + kMips +}; + +std::ostream& operator<<(std::ostream& os, const InstructionSet& rhs); + +} // namespace art + +#endif // ART_SRC_INSTRUCTION_SET_H_ diff --git a/src/constants.h b/src/invoke_type.h index 832d6f7..f37f1b4 100644 --- a/src/constants.h +++ b/src/invoke_type.h @@ -14,23 +14,13 @@ * limitations under the License. */ -#ifndef ART_SRC_CONSTANTS_H_ -#define ART_SRC_CONSTANTS_H_ +#ifndef ART_SRC_INVOKE_TYPE_H_ +#define ART_SRC_INVOKE_TYPE_H_ #include <iosfwd> namespace art { -enum InstructionSet { - kNone, - kArm, - kThumb2, - kX86, - kMips -}; - -std::ostream& operator<<(std::ostream& os, const InstructionSet& rhs); - enum InvokeType { kStatic, kDirect, kVirtual, kSuper, kInterface, kMaxInvokeType = kInterface @@ -40,7 +30,4 @@ std::ostream& operator<<(std::ostream& os, const InvokeType& rhs); } // namespace art -#include "constants_x86.h" -#include "constants_arm.h" - -#endif // ART_SRC_CONSTANTS_H_ +#endif // ART_SRC_INVOKE_TYPE_H_ @@ -19,8 +19,8 @@ #include <vector> -#include "constants.h" #include "dex_file.h" +#include "instruction_set.h" #include "macros.h" namespace art { diff --git a/src/oat/jni/jni_compiler.cc b/src/oat/jni/jni_compiler.cc index 30341c2..4a186aa 100644 --- a/src/oat/jni/jni_compiler.cc +++ b/src/oat/jni/jni_compiler.cc @@ -21,7 +21,6 @@ #include "class_linker.h" #include "compiled_method.h" #include "compiler.h" -#include "constants.h" #include "jni_internal.h" #include "logging.h" #include "macros.h" diff --git a/src/oat/runtime/arm/runtime_support_arm.S b/src/oat/runtime/arm/runtime_support_arm.S index 5446919..045feac 100644 --- a/src/oat/runtime/arm/runtime_support_arm.S +++ b/src/oat/runtime/arm/runtime_support_arm.S @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2012 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 "asm_support.h" /* Deliver the given exception */ diff --git a/src/oat/runtime/callee_save_frame.h b/src/oat/runtime/callee_save_frame.h index 96811ce..1509553 100644 --- a/src/oat/runtime/callee_save_frame.h +++ b/src/oat/runtime/callee_save_frame.h @@ -1,5 +1,5 @@ /* - * Copyright 2012 Google Inc. All Rights Reserved. + * Copyright (C) 2012 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. diff --git a/src/oat/runtime/mips/runtime_support_mips.S b/src/oat/runtime/mips/runtime_support_mips.S index 65431e3..12cebfd 100644 --- a/src/oat/runtime/mips/runtime_support_mips.S +++ b/src/oat/runtime/mips/runtime_support_mips.S @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2012 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 "asm_support.h" .balign 4 diff --git a/src/oat/runtime/support_jni.cc b/src/oat/runtime/support_jni.cc index d74f78f..7324cf4 100644 --- a/src/oat/runtime/support_jni.cc +++ b/src/oat/runtime/support_jni.cc @@ -1,5 +1,5 @@ /* - * Copyright 2012 Google Inc. All Rights Reserved. + * Copyright (C) 2012 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. diff --git a/src/oat/runtime/support_math.cc b/src/oat/runtime/support_math.cc index cb5f705..adef64a 100644 --- a/src/oat/runtime/support_math.cc +++ b/src/oat/runtime/support_math.cc @@ -1,5 +1,5 @@ /* - * Copyright 2012 Google Inc. All Rights Reserved. + * Copyright (C) 2012 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. diff --git a/src/oat/runtime/support_proxy.cc b/src/oat/runtime/support_proxy.cc index a9c7ebe..dd92fb1 100644 --- a/src/oat/runtime/support_proxy.cc +++ b/src/oat/runtime/support_proxy.cc @@ -1,5 +1,5 @@ /* - * Copyright 2012 Google Inc. All Rights Reserved. + * Copyright (C) 2012 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. diff --git a/src/oat/runtime/support_stubs.cc b/src/oat/runtime/support_stubs.cc index cb224e8..8727a5d 100644 --- a/src/oat/runtime/support_stubs.cc +++ b/src/oat/runtime/support_stubs.cc @@ -1,5 +1,5 @@ /* - * Copyright 2012 Google Inc. All Rights Reserved. + * Copyright (C) 2012 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. diff --git a/src/oat/runtime/support_thread.cc b/src/oat/runtime/support_thread.cc index ed04673..6cd595b 100644 --- a/src/oat/runtime/support_thread.cc +++ b/src/oat/runtime/support_thread.cc @@ -1,5 +1,5 @@ /* - * Copyright 2012 Google Inc. All Rights Reserved. + * Copyright (C) 2012 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. diff --git a/src/oat/runtime/support_throw.cc b/src/oat/runtime/support_throw.cc index 9f46b2b..e2e5c94 100644 --- a/src/oat/runtime/support_throw.cc +++ b/src/oat/runtime/support_throw.cc @@ -1,5 +1,5 @@ /* - * Copyright 2012 Google Inc. All Rights Reserved. + * Copyright (C) 2012 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. diff --git a/src/oat/runtime/support_trace.cc b/src/oat/runtime/support_trace.cc index 5c6a46e..c6fbfef 100644 --- a/src/oat/runtime/support_trace.cc +++ b/src/oat/runtime/support_trace.cc @@ -1,5 +1,5 @@ /* - * Copyright 2012 Google Inc. All Rights Reserved. + * Copyright (C) 2012 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. diff --git a/src/oat/runtime/x86/runtime_support_x86.S b/src/oat/runtime/x86/runtime_support_x86.S index 8f7177c..3333469 100644 --- a/src/oat/runtime/x86/runtime_support_x86.S +++ b/src/oat/runtime/x86/runtime_support_x86.S @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2012 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 "asm_support.h" #if defined(__APPLE__) diff --git a/src/oat/utils/arm/assembler_arm.h b/src/oat/utils/arm/assembler_arm.h index d26fc1f..e4ccfd8 100644 --- a/src/oat/utils/arm/assembler_arm.h +++ b/src/oat/utils/arm/assembler_arm.h @@ -17,7 +17,7 @@ #ifndef ART_SRC_OAT_UTILS_ARM_ASSEMBLER_ARM_H_ #define ART_SRC_OAT_UTILS_ARM_ASSEMBLER_ARM_H_ -#include "constants.h" +#include "constants_arm.h" #include "logging.h" #include "oat/utils/arm/managed_register_arm.h" #include "oat/utils/assembler.h" diff --git a/src/oat/utils/arm/managed_register_arm.h b/src/oat/utils/arm/managed_register_arm.h index 8808d2b..e29af92 100644 --- a/src/oat/utils/arm/managed_register_arm.h +++ b/src/oat/utils/arm/managed_register_arm.h @@ -17,7 +17,7 @@ #ifndef ART_SRC_OAT_UTILS_ARM_MANAGED_REGISTER_ARM_H_ #define ART_SRC_OAT_UTILS_ARM_MANAGED_REGISTER_ARM_H_ -#include "constants.h" +#include "constants_arm.h" #include "logging.h" #include "oat/utils/managed_register.h" diff --git a/src/oat/utils/assembler.h b/src/oat/utils/assembler.h index 6fd150d..47f1ead 100644 --- a/src/oat/utils/assembler.h +++ b/src/oat/utils/assembler.h @@ -19,7 +19,9 @@ #include <vector> -#include "constants.h" +#include "constants_arm.h" +#include "constants_x86.h" +#include "instruction_set.h" #include "logging.h" #include "macros.h" #include "managed_register.h" diff --git a/src/oat/utils/x86/assembler_x86.h b/src/oat/utils/x86/assembler_x86.h index f7d26ff..886e173 100644 --- a/src/oat/utils/x86/assembler_x86.h +++ b/src/oat/utils/x86/assembler_x86.h @@ -18,7 +18,7 @@ #define ART_SRC_OAT_UTILS_X86_ASSEMBLER_X86_H_ #include <vector> -#include "constants.h" +#include "constants_x86.h" #include "globals.h" #include "managed_register_x86.h" #include "macros.h" diff --git a/src/oat_file.h b/src/oat_file.h index 8ef8308..281ef78 100644 --- a/src/oat_file.h +++ b/src/oat_file.h @@ -19,7 +19,6 @@ #include <vector> -#include "constants.h" #include "dex_file.h" #include "mem_map.h" #include "oat.h" diff --git a/src/object.h b/src/object.h index 426a48c..4d054b9 100644 --- a/src/object.h +++ b/src/object.h @@ -23,7 +23,6 @@ #include "UniquePtr.h" #include "atomic.h" #include "casts.h" -#include "constants.h" #include "globals.h" #include "heap.h" #include "logging.h" diff --git a/src/runtime.cc b/src/runtime.cc index 7e0eab5..3aa7e6e 100644 --- a/src/runtime.cc +++ b/src/runtime.cc @@ -25,6 +25,8 @@ #include "class_linker.h" #include "class_loader.h" +#include "constants_arm.h" +#include "constants_x86.h" #include "debugger.h" #include "dex_verifier.h" #include "heap.h" diff --git a/src/runtime.h b/src/runtime.h index 36dd5c6..b8fe35a 100644 --- a/src/runtime.h +++ b/src/runtime.h @@ -27,8 +27,8 @@ #include <jni.h> -#include "constants.h" #include "heap.h" +#include "instruction_set.h" #include "globals.h" #include "macros.h" #include "runtime_stats.h" diff --git a/src/runtime_support.cc b/src/runtime_support.cc index 9072d58..0ee9990 100644 --- a/src/runtime_support.cc +++ b/src/runtime_support.cc @@ -1,5 +1,5 @@ /* - * Copyright 2012 Google Inc. All Rights Reserved. + * Copyright (C) 2012 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. diff --git a/src/runtime_support.h b/src/runtime_support.h index 909fb41..2f5ba5b 100644 --- a/src/runtime_support.h +++ b/src/runtime_support.h @@ -1,4 +1,18 @@ -// Copyright 2012 Google Inc. All Rights Reserved. +/* + * Copyright (C) 2012 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 ART_SRC_RUNTIME_SUPPORT_H_ #define ART_SRC_RUNTIME_SUPPORT_H_ @@ -6,6 +20,7 @@ #include "class_linker.h" #include "dex_file.h" #include "dex_verifier.h" +#include "invoke_type.h" #include "object.h" #include "object_utils.h" #include "thread.h" diff --git a/src/stack_indirect_reference_table.h b/src/stack_indirect_reference_table.h index 5f37294..681405f 100644 --- a/src/stack_indirect_reference_table.h +++ b/src/stack_indirect_reference_table.h @@ -17,6 +17,7 @@ #ifndef ART_SRC_STACK_INDIRECT_REFERENCE_TABLE_H_ #define ART_SRC_STACK_INDIRECT_REFERENCE_TABLE_H_ +#include "casts.h" #include "logging.h" #include "macros.h" #include "thread.h" diff --git a/test/044-proxy/src/ReturnsAndArgPassing.java b/test/044-proxy/src/ReturnsAndArgPassing.java index 6a706cb..50eff77 100644 --- a/test/044-proxy/src/ReturnsAndArgPassing.java +++ b/test/044-proxy/src/ReturnsAndArgPassing.java @@ -1,5 +1,5 @@ /* - * Copyright 2011 Google Inc. All Rights Reserved. + * Copyright (C) 2011 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. @@ -15,9 +15,6 @@ */ import java.lang.reflect.*; -/** - * @author irogers@google.com (Ian Rogers) - */ public class ReturnsAndArgPassing { public static final String testName = "ReturnsAndArgPassing"; |