commit b984ded74d1e03e5a515cd003c0586de1388346f
author Brian Carlstrom <bdc@google.com> Sun Jul 24 14:10:41 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Sun Jul 24 14:10:41 2011 -0700
tree 50685ceead05e49109a432af26002cf6f045dce5
parent f3eb61f6d0f45f0d52aa3b5c3b24639af9b07f98
parent 59848dad0b711856fc1bfb81748bbe944b045640

Merge "Import cpplint.py and make target cpplint-art" into dalvik-dev

src/class_linker_test.cc

diff --git a/src/class_linker_test.cc b/src/class_linker_test.cc
index 938b6fe..54b13fe 100644
--- a/src/class_linker_test.cc
+++ b/src/class_linker_test.cc
@@ -82,15 +82,15 @@
 }
 
 TEST_F(ClassLinkerTest, FindClassNested) {
-  scoped_ptr<DexFile> nestedDex(OpenDexFileBase64(kNestedDex));
-  class_linker_.get()->RegisterDexFile(nestedDex.get());
+  scoped_ptr<DexFile> nested_dex(OpenDexFileBase64(kNestedDex));
+  class_linker_.get()->RegisterDexFile(nested_dex.get());
 
-  Class* outer = class_linker_.get()->FindClass("LNested;", NULL, nestedDex.get());
+  Class* outer = class_linker_.get()->FindClass("LNested;", NULL, nested_dex.get());
   ASSERT_TRUE(outer != NULL);
   EXPECT_EQ(0U, outer->NumVirtualMethods());
   EXPECT_EQ(1U, outer->NumDirectMethods());
 
-  Class* inner = class_linker_.get()->FindClass("LNested$Inner;", NULL, nestedDex.get());
+  Class* inner = class_linker_.get()->FindClass("LNested$Inner;", NULL, nested_dex.get());
   ASSERT_TRUE(inner != NULL);
   EXPECT_EQ(0U, inner->NumVirtualMethods());
   EXPECT_EQ(1U, inner->NumDirectMethods());

src/jni_compiler.h

diff --git a/src/jni_compiler.h b/src/jni_compiler.h
index 495164b..48666aa 100644
--- a/src/jni_compiler.h
+++ b/src/jni_compiler.h
@@ -3,9 +3,9 @@
 #ifndef ART_SRC_JNI_COMPILER_H_
 #define ART_SRC_JNI_COMPILER_H_
 
-#include "src/calling_convention.h"
-#include "src/globals.h"
-#include "src/macros.h"
+#include "calling_convention.h"
+#include "globals.h"
+#include "macros.h"
 
 namespace art {