From 65aae7b1d0c80c15e88ad78d509eff37439838c9 Mon Sep 17 00:00:00 2001
From: Darien Raymond <admin@v2ray.com>
Date: Mon, 29 Oct 2018 23:13:31 +0100
Subject: [PATCH] merge config target

---
 release/BUILD | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/release/BUILD b/release/BUILD
index d2563ca5..f0ad4f50 100644
--- a/release/BUILD
+++ b/release/BUILD
@@ -5,12 +5,7 @@ load("//release:mapping.bzl", "gen_mappings")
 
 filegroup(
   name = "config_json",
-  srcs = ["config/config.json"],
-)
-
-filegroup(
-  name = "config_all",
-  srcs = ["config/vpoint_socks_vmess.json", "config/vpoint_vmess_freedom.json"],
+  srcs = ["config/config.json", "config/vpoint_socks_vmess.json", "config/vpoint_vmess_freedom.json"],
 )
 
 filegroup(
@@ -159,7 +154,7 @@ pkg_zip(
     "//main:v2ray_linux_amd64_sig",
     "@v2ray_ext//tools/control/main:v2ctl_linux_amd64",
     "@v2ray_ext//tools/control/main:v2ctl_linux_amd64_sig",
-    ":config_all",
+    ":config_json",
     ":systemd",
     ":doc",
     ":geodata",
@@ -175,7 +170,7 @@ pkg_zip(
     "//main:v2ray_linux_386_sig",
     "@v2ray_ext//tools/control/main:v2ctl_linux_386",
     "@v2ray_ext//tools/control/main:v2ctl_linux_386_sig",
-    ":config_all",
+    ":config_json",
     ":systemd",
     ":doc",
     ":geodata",
@@ -195,7 +190,7 @@ pkg_zip(
     "@v2ray_ext//tools/control/main:v2ctl_linux_arm_sig",
     "@v2ray_ext//tools/control/main:v2ctl_linux_arm_armv7",
     "@v2ray_ext//tools/control/main:v2ctl_linux_arm_armv7_sig",
-    ":config_all",
+    ":config_json",
     ":systemd",
     ":doc",
     ":geodata",
@@ -211,7 +206,7 @@ pkg_zip(
     "//main:v2ray_linux_arm64_sig",
     "@v2ray_ext//tools/control/main:v2ctl_linux_arm64",
     "@v2ray_ext//tools/control/main:v2ctl_linux_arm64_sig",
-    ":config_all",
+    ":config_json",
     ":systemd",
     ":doc",
     ":geodata",
@@ -231,7 +226,7 @@ pkg_zip(
     "@v2ray_ext//tools/control/main:v2ctl_linux_mips_sig",
     "@v2ray_ext//tools/control/main:v2ctl_linux_mips_softfloat",
     "@v2ray_ext//tools/control/main:v2ctl_linux_mips_softfloat_sig",
-    ":config_all",
+    ":config_json",
     ":systemd",
     ":doc",
     ":geodata",
@@ -251,7 +246,7 @@ pkg_zip(
     "@v2ray_ext//tools/control/main:v2ctl_linux_mipsle_sig",
     "@v2ray_ext//tools/control/main:v2ctl_linux_mipsle_softfloat",
     "@v2ray_ext//tools/control/main:v2ctl_linux_mipsle_softfloat_sig",
-    ":config_all",
+    ":config_json",
     ":systemd",
     ":doc",
     ":geodata",
@@ -268,7 +263,7 @@ pkg_zip(
     "//main:v2ray_linux_mips64_sig",
     "@v2ray_ext//tools/control/main:v2ctl_linux_mips64",
     "@v2ray_ext//tools/control/main:v2ctl_linux_mips64_sig",
-    ":config_all",
+    ":config_json",
     ":systemd",
     ":doc",
     ":geodata",
@@ -284,7 +279,7 @@ pkg_zip(
     "//main:v2ray_linux_mips64le_sig",
     "@v2ray_ext//tools/control/main:v2ctl_linux_mips64le",
     "@v2ray_ext//tools/control/main:v2ctl_linux_mips64le_sig",
-    ":config_all",
+    ":config_json",
     ":systemd",
     ":doc",
     ":geodata",
@@ -300,7 +295,7 @@ pkg_zip(
     "//main:v2ray_linux_s390x_sig",
     "@v2ray_ext//tools/control/main:v2ctl_linux_s390x",
     "@v2ray_ext//tools/control/main:v2ctl_linux_s390x_sig",
-    ":config_all",
+    ":config_json",
     ":systemd",
     ":doc",
     ":geodata",