commit 521039327f5306eb54c889ec4adb742d6fc11013
author ctiller <ctiller@google.com> Sat Dec 20 09:07:32 2014 -0800
committer Jan Tattermusch <jtattermusch@google.com> Mon Dec 29 17:09:27 2014 -0800
tree d82b0d2967949c01b4700c79f300f6aa50e1caa9
parent 09cb6d56510cf36e892bdcbbea0051d717eac60c

Update build.json, fix opensource build.
	Change on 2014/12/20 by ctiller <ctiller@google.com>
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=82580775

Makefile

diff --git a/Makefile b/Makefile
index 64474fd..701c2d8 100644
--- a/Makefile
+++ b/Makefile
@@ -1094,6 +1094,8 @@
     src/core/httpcli/httpcli.c \
     src/core/httpcli/httpcli_security_context.c \
     src/core/httpcli/parser.c \
+    src/core/iomgr/alarm.c \
+    src/core/iomgr/alarm_heap.c \
     src/core/iomgr/endpoint.c \
     src/core/iomgr/endpoint_pair_posix.c \
     src/core/iomgr/iomgr_libevent.c \
@@ -2229,6 +2231,8 @@
     src/core/httpcli/httpcli.c \
     src/core/httpcli/httpcli_security_context.c \
     src/core/httpcli/parser.c \
+    src/core/iomgr/alarm.c \
+    src/core/iomgr/alarm_heap.c \
     src/core/iomgr/endpoint.c \
     src/core/iomgr/endpoint_pair_posix.c \
     src/core/iomgr/iomgr_libevent.c \

build.json

diff --git a/build.json b/build.json
index 2fe11d8..3d961dd 100644
--- a/build.json
+++ b/build.json
@@ -115,6 +115,8 @@
         "src/core/httpcli/httpcli.c",
         "src/core/httpcli/httpcli_security_context.c",
         "src/core/httpcli/parser.c",
+        "src/core/iomgr/alarm.c",
+        "src/core/iomgr/alarm_heap.c",
         "src/core/iomgr/endpoint.c",
         "src/core/iomgr/endpoint_pair_posix.c",
         "src/core/iomgr/iomgr_libevent.c",
@@ -211,6 +213,8 @@
         "src/core/httpcli/httpcli_security_context.h",
         "src/core/httpcli/parser.h",
         "src/core/iomgr/alarm.h",
+        "src/core/iomgr/alarm_heap.h",
+        "src/core/iomgr/alarm_internal.h",
         "src/core/iomgr/endpoint.h",
         "src/core/iomgr/endpoint_pair.h",
         "src/core/iomgr/iomgr_completion_queue_interface.h",

vsprojects/vs2013/grpc.vcxproj

diff --git a/vsprojects/vs2013/grpc.vcxproj b/vsprojects/vs2013/grpc.vcxproj
index 391354c..d892cfc 100644
--- a/vsprojects/vs2013/grpc.vcxproj
+++ b/vsprojects/vs2013/grpc.vcxproj
@@ -99,6 +99,8 @@
     <ClInclude Include="..\..\src\core\httpcli\httpcli_security_context.h" />
     <ClInclude Include="..\..\src\core\httpcli\parser.h" />
     <ClInclude Include="..\..\src\core\iomgr\alarm.h" />
+    <ClInclude Include="..\..\src\core\iomgr\alarm_heap.h" />
+    <ClInclude Include="..\..\src\core\iomgr\alarm_internal.h" />
     <ClInclude Include="..\..\src\core\iomgr\endpoint.h" />
     <ClInclude Include="..\..\src\core\iomgr\endpoint_pair.h" />
     <ClInclude Include="..\..\src\core\iomgr\iomgr_completion_queue_interface.h" />
@@ -202,6 +204,10 @@
     </ClCompile>
     <ClCompile Include="..\..\src\core\httpcli\parser.c">
     </ClCompile>
+    <ClCompile Include="..\..\src\core\iomgr\alarm.c">
+    </ClCompile>
+    <ClCompile Include="..\..\src\core\iomgr\alarm_heap.c">
+    </ClCompile>
     <ClCompile Include="..\..\src\core\iomgr\endpoint.c">
     </ClCompile>
     <ClCompile Include="..\..\src\core\iomgr\endpoint_pair_posix.c">