Merge branch 'stable-2.15' into stable-2.16
* stable-2.15: Update links to Google individual and corporate CLA pages Bazel: Remove iteration over depset Print test errors by default Change-Id: I850e88bc3a744af1e24a8b9783ebe6d16a8722a5
This commit is contained in:
4
.bazelrc
4
.bazelrc
@@ -2,7 +2,9 @@ build --workspace_status_command=./tools/workspace-status.sh --strategy=Closure=
|
||||
build --repository_cache=~/.gerritcodereview/bazel-cache/repository
|
||||
build --experimental_strict_action_env
|
||||
build --action_env=PATH
|
||||
test --build_tests_only
|
||||
build --disk_cache=~/.gerritcodereview/bazel-cache/cas
|
||||
|
||||
test --build_tests_only
|
||||
test --test_output=errors
|
||||
|
||||
import tools/remote-bazelrc
|
||||
|
@@ -17,10 +17,10 @@ link:https://gerrit-review.googlesource.com/#/settings/agreements[Agreements]
|
||||
tab on the settings page
|
||||
* Click 'New Contributor Agreement' and follow the instructions
|
||||
|
||||
For reference, the actual agreements are linked below
|
||||
For reference, the actual agreements are linked below:
|
||||
|
||||
* link:https://cla.developers.google.com/about/android-individual[Individual Agreement]
|
||||
* link:https://source.android.com/source/cla-corporate.pdf[Corporate Agreement]
|
||||
* link:https://cla.developers.google.com/about/google-individual[Individual Agreement]
|
||||
* link:https://cla.developers.google.com/about/google-corporate[Corporate Agreement]
|
||||
|
||||
== Code Review
|
||||
As Gerrit is a code review tool, naturally contributions will
|
||||
|
@@ -149,9 +149,7 @@ def _gwt_binary_impl(ctx):
|
||||
|
||||
deps = _get_transitive_closure(ctx)
|
||||
|
||||
paths = []
|
||||
for dep in deps:
|
||||
paths.append(dep.path)
|
||||
paths = [dep.path for dep in deps.to_list()]
|
||||
|
||||
gwt_user_agent_modules = []
|
||||
ua = _gwt_user_agent_module(ctx)
|
||||
@@ -186,7 +184,7 @@ def _gwt_binary_impl(ctx):
|
||||
])
|
||||
|
||||
ctx.actions.run_shell(
|
||||
inputs = list(deps) + gwt_user_agent_modules,
|
||||
inputs = depset(direct = gwt_user_agent_modules, transitive = [deps]),
|
||||
outputs = [output_zip],
|
||||
tools = ctx.files._jdk + ctx.files._zip,
|
||||
mnemonic = "GwtBinary",
|
||||
|
@@ -304,7 +304,7 @@ def _bundle_impl(ctx):
|
||||
else:
|
||||
bundled = ctx.outputs.html
|
||||
destdir = ctx.outputs.html.path + ".dir"
|
||||
zips = [z for d in ctx.attr.deps for z in d.transitive_zipfiles]
|
||||
zips = [z for d in ctx.attr.deps for z in d.transitive_zipfiles.to_list()]
|
||||
|
||||
hermetic_npm_binary = " ".join([
|
||||
"python",
|
||||
|
@@ -35,7 +35,7 @@ def _SafeIndex(l, val):
|
||||
return -1
|
||||
|
||||
def _AsClassName(fname):
|
||||
fname = [x.path for x in fname.files][0]
|
||||
fname = [x.path for x in fname.files.to_list()][0]
|
||||
toks = fname[:-5].split("/")
|
||||
findex = -1
|
||||
for s in _PREFIXES:
|
||||
|
Reference in New Issue
Block a user