Fix lint error, and Makefile that could be confused with local files.

Change-Id: I780cc0d6593eadd6f82e1126d7ad445894af666c

diff --git a/build/Android.cpplint.mk b/build/Android.cpplint.mk
index adb87cb..1ecad21 100644 (file)
--- a/build/Android.cpplint.mk
+++ b/build/Android.cpplint.mk
@@ -16,7 +16,7 @@
 
 ART_CPPLINT := art/tools/cpplint.py
 ART_CPPLINT_FILTER := --filter=-whitespace/line_length,-build/include,-readability/function,-readability/streams,-readability/todo,-runtime/references,-runtime/sizeof,-runtime/threadsafe_fn,-runtime/printf
-ART_CPPLINT_SRC := $(shell find art -name *.h -o -name *$(ART_CPP_EXTENSION) | grep -v art/compiler/llvm/generated/)
+ART_CPPLINT_SRC := $(shell find art -name "*.h" -o -name "*$(ART_CPP_EXTENSION)" | grep -v art/compiler/llvm/generated/)
 
 # "mm cpplint-art" to verify we aren't regressing
 .PHONY: cpplint-art

diff --git a/compiler/optimizing/nodes.cc b/compiler/optimizing/nodes.cc
index b8b4a3b..498deba 100644 (file)
--- a/compiler/optimizing/nodes.cc
+++ b/compiler/optimizing/nodes.cc
@@ -122,7 +122,7 @@ void HGraph::VisitBlockForDominatorTree(HBasicBlock* block,
 
 void HBasicBlock::AddInstruction(HInstruction* instruction) {
   DCHECK(instruction->GetBlock() == nullptr);
-  DCHECK(instruction->GetId() == -1);
+  DCHECK_EQ(instruction->GetId(), -1);
   instruction->SetBlock(this);
   instruction->SetId(GetGraph()->GetNextInstructionId());
   if (first_instruction_ == nullptr) {