honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build(bazel): fix merge conflict between c4f02e2 and ef956a2 (#21453) 

PR Close #21453
This commit is contained in:
Alex Eagle 2018-01-10 12:48:01 -08:00
parent e3e2fc0c3b
commit 2ad92ed254
6 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/benchmarks/src/BUILD.bazel
View File

@ -1,13 +1,12 @@
package(default_visibility = ["//visibility:public"]) package(default_visibility = ["//visibility:public"])
load("@build_bazel_rules_typescript//:defs.bzl", "ts_library") load("//tools:defaults.bzl", "ts_library")
ts_library( ts_library(
name = "util_lib", name = "util_lib",
srcs = [ srcs = [
"util.ts", "util.ts",
], ],
tsconfig = "//packages:tsconfig",
deps = [ deps = [
"//packages:types", "//packages:types",
"//packages/core", "//packages/core",

3
modules/benchmarks/src/largetable/BUILD.bazel
View File

@ -1,13 +1,12 @@
package(default_visibility = ["//visibility:public"]) package(default_visibility = ["//visibility:public"])
load("@build_bazel_rules_typescript//:defs.bzl", "ts_library") load("//tools:defaults.bzl", "ts_library")
ts_library( ts_library(
name = "util_lib", name = "util_lib",
srcs = [ srcs = [
"util.ts", "util.ts",
], ],
tsconfig = "//packages:tsconfig",
deps = [ deps = [
"//modules/benchmarks/src:util_lib", "//modules/benchmarks/src:util_lib",
"//packages:types", "//packages:types",

4
modules/benchmarks/src/largetable/render3/BUILD.bazel
View File

@ -1,7 +1,6 @@
package(default_visibility = ["//visibility:public"]) package(default_visibility = ["//visibility:public"])
load("@angular//:index.bzl", "ng_module") load("//tools:defaults.bzl", "ng_module")
load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
ng_module( ng_module(
name = "largetable_lib", name = "largetable_lib",
@ -10,7 +9,6 @@ ng_module(
"**/*.ts", "**/*.ts",
], ],
), ),
tsconfig = "//packages:tsconfig",
deps = [ deps = [
"//modules/benchmarks/src/largetable:util_lib", "//modules/benchmarks/src/largetable:util_lib",
"//packages:types", "//packages:types",

3
modules/benchmarks/src/tree/BUILD.bazel
View File

@ -1,13 +1,12 @@
package(default_visibility = ["//visibility:public"]) package(default_visibility = ["//visibility:public"])
load("@build_bazel_rules_typescript//:defs.bzl", "ts_library") load("//tools:defaults.bzl", "ts_library")
ts_library( ts_library(
name = "util_lib", name = "util_lib",
srcs = [ srcs = [
"util.ts", "util.ts",
], ],
tsconfig = "//packages:tsconfig",
deps = [ deps = [
"//modules/benchmarks/src:util_lib", "//modules/benchmarks/src:util_lib",
"//packages:types", "//packages:types",

4
modules/benchmarks/src/tree/render3/BUILD.bazel
View File

@ -1,7 +1,6 @@
package(default_visibility = ["//visibility:public"]) package(default_visibility = ["//visibility:public"])
load("@angular//:index.bzl", "ng_module") load("//tools:defaults.bzl", "ng_module")
load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
ng_module( ng_module(
name = "render3_lib", name = "render3_lib",
@ -10,7 +9,6 @@ ng_module(
"**/*.ts", "**/*.ts",
], ],
), ),
tsconfig = "//packages:tsconfig",
deps = [ deps = [
"//modules/benchmarks/src/tree:util_lib", "//modules/benchmarks/src/tree:util_lib",
"//packages:types", "//packages:types",

4
modules/benchmarks/src/tree/render3_function/BUILD.bazel
View File

@ -1,7 +1,6 @@
package(default_visibility = ["//visibility:public"]) package(default_visibility = ["//visibility:public"])
load("@angular//:index.bzl", "ng_module") load("//tools:defaults.bzl", "ng_module")
load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
ng_module( ng_module(
name = "render3_function_lib", name = "render3_function_lib",
@ -10,7 +9,6 @@ ng_module(
"**/*.ts", "**/*.ts",
], ],
), ),
tsconfig = "//packages:tsconfig",
deps = [ deps = [
"//modules/benchmarks/src/tree:util_lib", "//modules/benchmarks/src/tree:util_lib",
"//modules/benchmarks/src/tree/render3:render3_lib", "//modules/benchmarks/src/tree/render3:render3_lib",