commit d41935f34d3005e2ee03d5db181a8f9d8fa9159e
author Treehugger Robot <treehugger-gerrit@google.com> Fri Oct 28 20:04:49 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 28 20:04:51 2016 +0000
tree c7dedb8d06b36677e694f75c777725cc0bee4e1d
parent 0cca77771514f3b811f584f753a40f2a9ea50c7b
parent 0c461f1f6e2a1663b426eec2247e5a26f2822970

Merge changes from topic 'proto'

* changes:
  Add support for .proto files
  Add Path.Base helper
  Simplify compileObjs

build.ninja.in

diff --git a/build.ninja.in b/build.ninja.in
index ec1bc0d..e22f146 100644
--- a/build.ninja.in
+++ b/build.ninja.in
@@ -154,7 +154,7 @@
 # Variant:
 # Type:    bootstrap_go_package
 # Factory: github.com/google/blueprint/bootstrap.newGoPackageModuleFactory.func1
-# Defined: build/blueprint/Blueprints:83:1
+# Defined: build/blueprint/Blueprints:85:1
 
 build $
         ${g.bootstrap.buildDir}/.bootstrap/blueprint-bootstrap/pkg/github.com/google/blueprint/bootstrap.a $
@@ -182,7 +182,7 @@
 # Variant:
 # Type:    bootstrap_go_package
 # Factory: github.com/google/blueprint/bootstrap.newGoPackageModuleFactory.func1
-# Defined: build/blueprint/Blueprints:102:1
+# Defined: build/blueprint/Blueprints:104:1
 
 build $
         ${g.bootstrap.buildDir}/.bootstrap/blueprint-bootstrap-bpdoc/pkg/github.com/google/blueprint/bootstrap/bpdoc.a $
@@ -354,10 +354,12 @@
         ${g.bootstrap.buildDir}/.bootstrap/blueprint-proptools/test/github.com/google/blueprint/proptools.a $
         : g.bootstrap.compile $
         ${g.bootstrap.srcDir}/build/blueprint/proptools/clone.go $
+        ${g.bootstrap.srcDir}/build/blueprint/proptools/escape.go $
         ${g.bootstrap.srcDir}/build/blueprint/proptools/extend.go $
         ${g.bootstrap.srcDir}/build/blueprint/proptools/proptools.go $
         ${g.bootstrap.srcDir}/build/blueprint/proptools/typeequal.go $
         ${g.bootstrap.srcDir}/build/blueprint/proptools/clone_test.go $
+        ${g.bootstrap.srcDir}/build/blueprint/proptools/escape_test.go $
         ${g.bootstrap.srcDir}/build/blueprint/proptools/extend_test.go $
         ${g.bootstrap.srcDir}/build/blueprint/proptools/typeequal_test.go | $
         ${g.bootstrap.compileCmd}
@@ -368,6 +370,7 @@
 build ${g.bootstrap.buildDir}/.bootstrap/blueprint-proptools/test/test.go: $
         g.bootstrap.gotestmain $
         ${g.bootstrap.srcDir}/build/blueprint/proptools/clone_test.go $
+        ${g.bootstrap.srcDir}/build/blueprint/proptools/escape_test.go $
         ${g.bootstrap.srcDir}/build/blueprint/proptools/extend_test.go $
         ${g.bootstrap.srcDir}/build/blueprint/proptools/typeequal_test.go | $
         ${g.bootstrap.goTestMainCmd}
@@ -403,6 +406,7 @@
         ${g.bootstrap.buildDir}/.bootstrap/blueprint-proptools/pkg/github.com/google/blueprint/proptools.a $
         : g.bootstrap.compile $
         ${g.bootstrap.srcDir}/build/blueprint/proptools/clone.go $
+        ${g.bootstrap.srcDir}/build/blueprint/proptools/escape.go $
         ${g.bootstrap.srcDir}/build/blueprint/proptools/extend.go $
         ${g.bootstrap.srcDir}/build/blueprint/proptools/proptools.go $
         ${g.bootstrap.srcDir}/build/blueprint/proptools/typeequal.go | $
@@ -417,7 +421,7 @@
 # Variant:
 # Type:    bootstrap_core_go_binary
 # Factory: github.com/google/blueprint/bootstrap.newGoBinaryModuleFactory.func1
-# Defined: build/blueprint/Blueprints:135:1
+# Defined: build/blueprint/Blueprints:137:1
 
 build ${g.bootstrap.buildDir}/.bootstrap/gotestmain/obj/gotestmain.a: $
         g.bootstrap.compile $
@@ -441,7 +445,7 @@
 # Variant:
 # Type:    bootstrap_core_go_binary
 # Factory: github.com/google/blueprint/bootstrap.newGoBinaryModuleFactory.func1
-# Defined: build/blueprint/Blueprints:140:1
+# Defined: build/blueprint/Blueprints:142:1
 
 build ${g.bootstrap.buildDir}/.bootstrap/gotestrunner/obj/gotestrunner.a: $
         g.bootstrap.compile $
@@ -465,7 +469,7 @@
 # Variant:
 # Type:    bootstrap_core_go_binary
 # Factory: github.com/google/blueprint/bootstrap.newGoBinaryModuleFactory.func1
-# Defined: build/blueprint/Blueprints:114:1
+# Defined: build/blueprint/Blueprints:116:1
 
 build ${g.bootstrap.buildDir}/.bootstrap/minibp/obj/minibp.a: $
         g.bootstrap.compile $

cc/config/x86_darwin_host.go

diff --git a/cc/config/x86_darwin_host.go b/cc/config/x86_darwin_host.go
index 09418c7..b17395d 100644
--- a/cc/config/x86_darwin_host.go
+++ b/cc/config/x86_darwin_host.go
@@ -89,6 +89,7 @@
 		"10.9",
 		"10.10",
 		"10.11",
+                "10.12",
 	}
 
 	darwinAvailableLibraries = append(