Use api_manager codes from istio/proxy (#46)

* Use istio/proxy repo

* Move nginx_repositories close to its load.

* Fix start_esp main entry problem.

* Make some dummy change to trigger presubmit test .

* Fix Jenkin presubmit script.

.gitmodules

@@ -2,7 +2,3 @@
 	path = third_party/nginx-tests
 	url = https://nginx.googlesource.com/nginx-tests
 	ignore = untracked
-[submodule "third_party/service-control-client-cxx"]
-	path = third_party/service-control-client-cxx
-	url = https://github.com/cloudendpoints/service-control-client-cxx.git
-	ignore = untracked

Jenkinsfile

@@ -236,8 +236,7 @@ def presubmit(nodeLabel) {
       },
       'build-and-test': {
         node(nodeLabel) {
-          presubmitTests('service-control')
-          presubmitTests('build-and-test', false)
+          presubmitTests('build-and-test')
         }
       },
       'release': {

WORKSPACE

@@ -39,6 +39,53 @@ nginx_repositories(
     nginx = "@nginx//",
 )
 
+git_repository(
+    name = "istio_proxy_git",
+    commit = "2eb22f9dd8bf75a3624e78dfe72eadbc65a8a248",
+    remote = "https://github.com/istio/proxy",
+)
+
+bind(
+    name = "api_manager",
+    actual = "@istio_proxy_git//contrib/endpoints/include:api_manager",
+)
+
+bind(
+    name = "api_manager_version",
+    actual = "@istio_proxy_git//contrib/endpoints/include:version",
+)
+
+bind(
+    name = "api_manager_status_proto",
+    actual = "@istio_proxy_git//contrib/endpoints/src/api_manager:status_proto",
+)
+
+bind(
+    name = "api_manager_status_proto_genproto",
+    actual = "@istio_proxy_git//contrib/endpoints/src/api_manager:status_proto_genproto",
+)
+
+bind(
+    name = "api_manager_auth_lib",
+    actual = "@istio_proxy_git//contrib/endpoints/src/api_manager/auth/lib",
+)
+
+bind(
+    name = "api_manager_utils",
+    actual = "@istio_proxy_git//contrib/endpoints/src/api_manager/utils",
+)
+
+git_repository(
+    name = "servicecontrol_client_git",
+    commit = "d739d755365c6a13d0b4164506fd593f53932f5d",
+    remote = "https://github.com/cloudendpoints/service-control-client-cxx.git",
+)
+
+bind(
+    name = "servicecontrol_client",
+    actual = "@servicecontrol_client_git//:service_control_client_lib",
+)
+
 # Required by gRPC.
 bind(
     name = "libssl",

include/BUILD

@@ -24,60 +24,5 @@
 #
 ################################################################################
 #
-exports_files(["version"])
-
-cc_inc_library(
-    name = "api_manager",
-    hdrs = [
-        ":headers",
-    ],
-    visibility = ["//visibility:public"],
-    deps = [
-        "//src/api_manager",
-    ],
-)
-
-cc_library(
-    name = "headers_only",
-    hdrs = [
-        ":headers",
-    ],
-    visibility = [
-        "//src/api_manager:__subpackages__",
-        "//src/grpc:__subpackages__",
-    ],
-)
 
-filegroup(
-    name = "headers",
-    srcs = [
-        "api_manager/api_manager.h",
-        "api_manager/compute_platform.h",
-        "api_manager/env_interface.h",
-        "api_manager/http_request.h",
-        "api_manager/method.h",
-        "api_manager/method_call_info.h",
-        "api_manager/periodic_timer.h",
-        "api_manager/protocol.h",
-        "api_manager/request.h",
-        "api_manager/request_handler_interface.h",
-        "api_manager/response.h",
-        "api_manager/service_control.h",
-        "api_manager/utils/status.h",
-        "api_manager/version.h",
-    ],
-)
-
-genrule(
-    name = "api_manager_version_header",
-    srcs = [
-        ":version",
-    ],
-    outs = [
-        "api_manager/version.h",
-    ],
-    cmd = "$(location //tools:create_version) $(location :version) > $@",
-    tools = [
-        "//tools:create_version",
-    ],
-)
+exports_files(["version"])