Remove mixer_client from api_manager.

WORKSPACE

@@ -31,16 +31,20 @@ googletest_repositories()
 load(
     "//contrib/endpoints:repositories.bzl",
     "grpc_repositories",
-    "mixer_client_repositories",
     "servicecontrol_client_repositories",
 )
 
 grpc_repositories()
 
-mixer_client_repositories()
-
 servicecontrol_client_repositories()
 
+load(
+    "//src/envoy/mixer:repositories.bzl",
+    "mixer_client_repositories",
+)
+
+mixer_client_repositories()
+
 # Workaround for Bazel > 0.4.0 since it needs newer protobuf.bzl from:
 # https://github.com/google/protobuf/pull/2246
 # Do not use this git_repository for anything else than protobuf.bzl

contrib/endpoints/repositories.bzl

@@ -334,15 +334,3 @@ def servicecontrol_client_repositories(bind=True):
             actual = "@servicecontrol_client_git//:service_control_client_lib",
         )
 
-def mixer_client_repositories(bind=True):
-    native.git_repository(
-        name = "mixerclient_git",
-        commit = "80e450a5126960e8e6337c3631cf2ef984038eab",
-        remote = "https://github.com/istio/mixerclient.git",
-    )
-
-    if bind:
-        native.bind(
-            name = "mixer_client_lib",
-            actual = "@mixerclient_git//:mixer_client_lib",
-        )

contrib/endpoints/src/api_manager/context/BUILD

@@ -39,7 +39,6 @@ cc_library(
         "//contrib/endpoints/src/api_manager/auth",
         "//contrib/endpoints/src/api_manager/auth:service_account_token",
         "//contrib/endpoints/src/api_manager/cloud_trace",
-        "//contrib/endpoints/src/api_manager/mixer",
         "//contrib/endpoints/src/api_manager/service_control",
         "//contrib/endpoints/src/api_manager/utils",
         "//external:cc_wkt_protos",

contrib/endpoints/src/api_manager/context/service_context.cc

@@ -15,7 +15,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 //
 #include "contrib/endpoints/src/api_manager/context/service_context.h"
-#include "contrib/endpoints/src/api_manager/mixer/mixer.h"
 
 #include "contrib/endpoints/src/api_manager/service_control/aggregated.h"
 
@@ -97,16 +96,10 @@ const std::string& ServiceContext::project_id() const {
 }
 
 std::unique_ptr<service_control::Interface> ServiceContext::CreateInterface() {
-  if (config_->server_config() &&
-      config_->server_config()->has_mixer_options()) {
-    return std::unique_ptr<service_control::Interface>(
-        mixer::Mixer::Create(env_.get(), config_.get()));
-  } else {
-    return std::unique_ptr<service_control::Interface>(
-        service_control::Aggregated::Create(
-            config_->service(), config_->server_config(), env_.get(),
-            &service_account_token_));
-  }
+  return std::unique_ptr<service_control::Interface>(
+      service_control::Aggregated::Create(config_->service(),
+                                          config_->server_config(), env_.get(),
+                                          &service_account_token_));
 }
 
 std::unique_ptr<cloud_trace::Aggregator>