commit bb5e5fb4c5b9ded5fe414613ebac8104079fc566
author Treehugger Robot <treehugger-gerrit@google.com> Wed Apr 05 01:07:36 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 05 01:07:37 2017 +0000
tree ce6e60cbf961254c737ce4332d86c3a4f748579f
parent 866810db9f2328fd14b4572f86a365a31ba714b0
parent d8f8d076c09eead970011cc4b43f95ea83fe9e66

Merge changes Id38ce60b,I7c24c39b

* changes:
  Disable .toc generation for windows
  Add ctx.Windows()

cc/androidmk.go

diff --git a/cc/androidmk.go b/cc/androidmk.go
index 705ac90..50e97b1 100644
--- a/cc/androidmk.go
+++ b/cc/androidmk.go
@@ -294,6 +294,7 @@
 		fmt.Fprintln(w, "LOCAL_MODULE_SUFFIX := "+outputFile.Ext())
 		fmt.Fprintln(w, "LOCAL_MODULE_PATH := "+path)
 		fmt.Fprintln(w, "LOCAL_MODULE_STEM := "+stem)
+		fmt.Fprintln(w, "LOCAL_NO_NOTICE_FILE := true")
 
 		// Prevent make from installing the libraries to obj/lib (since we have
 		// dozens of libraries with the same name, they'll clobber each other