Skip to content

Commit e6b486f

Browse files
committed
squash and merge v8 build sync version 6.0.286.52
1 parent b91a3e9 commit e6b486f

File tree

612 files changed

+79425
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

612 files changed

+79425
-0
lines changed

.gitignore

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# This file is needed for projects that has this directory as a separate Git
2+
# mirror in DEPS. Without it, a lot is wiped and re-downloaded for each sync.
3+
/android/bin
4+
/android/binary_size/apks/**/*.apk
5+
/Debug
6+
/Debug_x64
7+
/goma
8+
/gomacc.lock
9+
/ipch/
10+
/Release
11+
/Release_x64
12+
/win_toolchain.json
13+
/util/LASTCHANGE*
14+
/util/support
15+
/x64/
16+
/linux/bin/eu-strip
17+
/linux/debian_*-sysroot/
18+
/linux/ubuntu_*-sysroot/
19+
/ios_files
20+
/mac_files
21+

OWNERS

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
2+
3+
4+
5+
6+
7+
8+
9+
per-file .gitignore=*
10+
11+
12+
13+
14+
per-file whitespace_file.txt=*
15+
per-file OWNERS.status=*
16+
17+
# gn-dev is probably a better team here, but the tooling won't let us
18+
# have more than one team per component, and infra-dev is a catch-all
19+
# for other build-related lists.
20+
#
21+
22+
# COMPONENT: Build

OWNERS.status

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Use this file to set a global status message that should be shown whenever
2+
# git cl owners proposes to add you as a reviewer.
3+
#
4+
# The status messages should be somewhat stable, so please don't use this for
5+
# short term, or frequently changing updates.
6+
#
7+
# The format of the file is
8+
#
9+
# [email protected]: Single line status message.
10+
#
11+
12+
[email protected]: EMEA based reviewer.

android/AndroidManifest.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
Copyright (c) 2012 The Chromium Authors. All rights reserved. Use of this
4+
source code is governed by a BSD-style license that can be found in the
5+
LICENSE file.
6+
-->
7+
8+
<!--
9+
This is a dummy manifest which is required by:
10+
1. aapt when generating R.java in java.gypi:
11+
Nothing in the manifest is used, but it is still required by aapt.
12+
2. lint: [min|target]SdkVersion are required by lint and should
13+
be kept up to date.
14+
-->
15+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
16+
package="org.dummy">
17+
18+
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="24" />
19+
20+
</manifest>

android/BUILD.gn

Lines changed: 165 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
1+
# Copyright 2014 The Chromium Authors. All rights reserved.
2+
# Use of this source code is governed by a BSD-style license that can be
3+
# found in the LICENSE file.
4+
5+
import("//build/config/android/config.gni")
6+
import("//build/config/android/rules.gni")
7+
8+
if (enable_java_templates) {
9+
import("//third_party/ijar/ijar.gni")
10+
11+
sun_tools_jar_path = "$root_gen_dir/sun_tools_jar/tools.jar"
12+
13+
# Create or update the API versions cache if necessary by running a
14+
# functionally empty lint task. This prevents racy creation of the
15+
# cache while linting java targets in android_lint.
16+
android_lint("prepare_android_lint_cache") {
17+
android_manifest = "//build/android/AndroidManifest.xml"
18+
create_cache = true
19+
}
20+
21+
action("find_sun_tools_jar") {
22+
script = "//build/android/gyp/find_sun_tools_jar.py"
23+
depfile = "$target_gen_dir/$target_name.d"
24+
outputs = [
25+
sun_tools_jar_path,
26+
]
27+
args = [
28+
"--depfile",
29+
rebase_path(depfile, root_build_dir),
30+
"--output",
31+
rebase_path(sun_tools_jar_path, root_build_dir),
32+
]
33+
}
34+
35+
java_prebuilt("sun_tools_java") {
36+
jar_path = sun_tools_jar_path
37+
jar_dep = ":find_sun_tools_jar"
38+
}
39+
40+
generate_interface_jar("android_ijar") {
41+
input_jar = android_sdk_jar
42+
output_jar = "$root_out_dir/lib.java/android.interface.jar"
43+
}
44+
45+
# Write to a file some GN vars that are useful to scripts that use the output
46+
# directory. Format is chosen as easliy importable by both python and bash.
47+
CR = "$0x0A"
48+
_data = ""
49+
_data += "android_sdk_build_tools=" +
50+
rebase_path(android_sdk_build_tools, root_build_dir) + CR
51+
_data += "android_sdk_build_tools_version=$android_sdk_build_tools_version$CR"
52+
_data +=
53+
"android_sdk_root=" + rebase_path(android_sdk_root, root_build_dir) + CR
54+
_data += "android_sdk_version=$android_sdk_version$CR"
55+
_data += "android_tool_prefix=" +
56+
rebase_path(android_tool_prefix, root_build_dir) + CR
57+
write_file("$root_build_dir/build_vars.txt", _data)
58+
}
59+
60+
# Copy to the lib.unstripped directory so that gdb can easily find it.
61+
copy("cpplib_unstripped") {
62+
_soname = "libc++_shared.so"
63+
sources = [
64+
"${android_libcpp_lib_dir}/${_soname}",
65+
]
66+
outputs = [
67+
"${root_out_dir}/lib.unstripped/${_soname}",
68+
]
69+
}
70+
71+
action("cpplib_stripped") {
72+
_strip_bin = "${android_tool_prefix}strip"
73+
_soname = "libc++_shared.so"
74+
_input_so = "${root_shlib_dir}/lib.unstripped/${_soname}"
75+
_output_so = "${root_shlib_dir}/${_soname}"
76+
77+
deps = [
78+
":cpplib_unstripped",
79+
]
80+
81+
script = "//build/gn_run_binary.py"
82+
inputs = [
83+
_strip_bin,
84+
]
85+
sources = [
86+
_input_so,
87+
]
88+
outputs = [
89+
_output_so,
90+
]
91+
data = [
92+
_output_so,
93+
]
94+
95+
_rebased_strip_bin = rebase_path(_strip_bin, root_build_dir)
96+
_rebased_input_so = rebase_path(_input_so, root_build_dir)
97+
_rebased_output_so = rebase_path(_output_so, root_build_dir)
98+
args = [
99+
_rebased_strip_bin,
100+
"--strip-unneeded",
101+
"-o",
102+
_rebased_output_so,
103+
_rebased_input_so,
104+
]
105+
}
106+
107+
group("test_runner_py") {
108+
_py_files = read_file("test_runner.pydeps", "list lines")
109+
110+
# Filter out comments.
111+
set_sources_assignment_filter([ "#*" ])
112+
sources = _py_files
113+
114+
data = sources + [
115+
"devil_chromium.json",
116+
"pylib/gtest/filter/",
117+
"pylib/instrumentation/render_test.html.jinja",
118+
"test_wrapper/logdog_wrapper.py",
119+
"${android_sdk_build_tools}/aapt",
120+
"${android_sdk_build_tools}/dexdump",
121+
"${android_sdk_build_tools}/lib64/libc++.so",
122+
"${android_sdk_build_tools}/split-select",
123+
"${android_sdk_root}/platform-tools/adb",
124+
"//third_party/catapult/third_party/gsutil/",
125+
"//third_party/catapult/devil/devil/devil_dependencies.json",
126+
"//third_party/proguard/lib/proguard.jar",
127+
]
128+
}
129+
130+
group("logdog_wrapper_py") {
131+
_py_files = read_file("test_wrapper/logdog_wrapper.pydeps", "list lines")
132+
133+
# Filter out comments.
134+
set_sources_assignment_filter([ "#*" ])
135+
sources = _py_files
136+
137+
data = sources
138+
}
139+
140+
# Create wrapper scripts in out/bin that takes care of setting the
141+
# --output-directory.
142+
_scripts_to_wrap = [
143+
# TODO(agrieve): Once GYP is no more, delete the checked-in adb_gdb_* scripts
144+
# and generated a script for each android_apk() that has a native library.
145+
"adb_gdb_android_webview_shell",
146+
"adb_gdb_chrome_public",
147+
"adb_gdb_content_shell",
148+
"adb_gdb_cronet_sample",
149+
"adb_gdb_mojo_shell",
150+
"asan_symbolize.py",
151+
"tombstones.py",
152+
]
153+
154+
_wrapper_targets = []
155+
foreach(script, _scripts_to_wrap) {
156+
_target_name = get_path_info(script, "name") + "_wrapper"
157+
_wrapper_targets += [ ":$_target_name" ]
158+
wrapper_script(_target_name) {
159+
target = script
160+
}
161+
}
162+
163+
group("wrapper_scripts") {
164+
deps = _wrapper_targets
165+
}

android/CheckInstallApk-debug.apk

36.2 KB
Binary file not shown.

android/OWNERS

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
2+
3+
4+
5+
6+
7+
# COMPONENT: Test>Android

android/PRESUBMIT.py

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
# Copyright (c) 2013 The Chromium Authors. All rights reserved.
2+
# Use of this source code is governed by a BSD-style license that can be
3+
# found in the LICENSE file.
4+
5+
"""Presubmit script for android buildbot.
6+
7+
See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts for
8+
details on the presubmit API built into depot_tools.
9+
"""
10+
11+
12+
def CommonChecks(input_api, output_api):
13+
output = []
14+
15+
build_android_dir = input_api.PresubmitLocalPath()
16+
17+
def J(*dirs):
18+
"""Returns a path relative to presubmit directory."""
19+
return input_api.os_path.join(build_android_dir, *dirs)
20+
21+
build_pys = [
22+
r'gyp/.*\.py$',
23+
r'gn/.*\.py',
24+
]
25+
output.extend(input_api.canned_checks.RunPylint(
26+
input_api,
27+
output_api,
28+
pylintrc='pylintrc',
29+
black_list=build_pys,
30+
extra_paths_list=[
31+
J(),
32+
J('gyp'),
33+
J('buildbot'),
34+
J('..', 'util', 'lib', 'common'),
35+
J('..', '..', 'third_party', 'catapult', 'common', 'py_trace_event'),
36+
J('..', '..', 'third_party', 'catapult', 'common', 'py_utils'),
37+
J('..', '..', 'third_party', 'catapult', 'devil'),
38+
J('..', '..', 'third_party', 'catapult', 'tracing')
39+
]))
40+
output.extend(input_api.canned_checks.RunPylint(
41+
input_api,
42+
output_api,
43+
white_list=build_pys,
44+
extra_paths_list=[J('gyp'), J('gn')]))
45+
46+
# Disabled due to http://crbug.com/410936
47+
#output.extend(input_api.canned_checks.RunUnitTestsInDirectory(
48+
#input_api, output_api, J('buildbot', 'tests')))
49+
50+
pylib_test_env = dict(input_api.environ)
51+
pylib_test_env.update({
52+
'PYTHONPATH': build_android_dir,
53+
'PYTHONDONTWRITEBYTECODE': '1',
54+
})
55+
output.extend(input_api.canned_checks.RunUnitTests(
56+
input_api,
57+
output_api,
58+
unit_tests=[
59+
J('.', 'emma_coverage_stats_test.py'),
60+
J('gyp', 'util', 'md5_check_test.py'),
61+
J('play_services', 'update_test.py'),
62+
J('pylib', 'gtest', 'gtest_test_instance_test.py'),
63+
J('pylib', 'instrumentation',
64+
'instrumentation_test_instance_test.py'),
65+
J('pylib', 'local', 'device', 'local_device_test_run_test.py'),
66+
J('pylib', 'results', 'json_results_test.py'),
67+
J('pylib', 'symbols', 'elf_symbolizer_unittest.py'),
68+
J('pylib', 'utils', 'decorators_test.py'),
69+
J('pylib', 'utils', 'device_dependencies_test.py'),
70+
J('pylib', 'utils', 'dexdump_test.py'),
71+
J('pylib', 'utils', 'proguard_test.py'),
72+
],
73+
env=pylib_test_env))
74+
75+
return output
76+
77+
78+
def CheckChangeOnUpload(input_api, output_api):
79+
return CommonChecks(input_api, output_api)
80+
81+
82+
def CheckChangeOnCommit(input_api, output_api):
83+
return CommonChecks(input_api, output_api)
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/bin/bash
2+
#
3+
# Copyright (c) 2013 The Chromium Authors. All rights reserved.
4+
# Use of this source code is governed by a BSD-style license that can be
5+
# found in the LICENSE file.
6+
7+
# If no flags are given, prints the current content shell flags.
8+
#
9+
# Otherwise, the given flags are used to REPLACE (not modify) the content shell
10+
# flags. For example:
11+
# adb_android_webview_command_line --enable-webgl
12+
#
13+
# To remove all content shell flags, pass an empty string for the flags:
14+
# adb_android_webview_command_line ""
15+
16+
exec $(dirname $0)/adb_command_line.py --name android-webview-command-line "$@"

android/adb_cast_shell_command_line

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#!/bin/bash
2+
#
3+
# Copyright 2016 The Chromium Authors. All rights reserved.
4+
# Use of this source code is governed by a BSD-style license that can be
5+
# found in the LICENSE file.
6+
7+
# If no flags are given, prints the current cast shell flags.
8+
#
9+
# Otherwise, the given flags are used to REPLACE (not modify) the cast shell
10+
# flags. For example:
11+
# adb_cast_shell_command_line --enable-media-thread-for-media-playback
12+
#
13+
# If multiple devices are connected, use the --device argument to specify the
14+
# device ID. You can use
15+
# adb devices
16+
# ... to find the device's ID.
17+
#
18+
# To remove all content shell flags, pass an empty string for the flags:
19+
# adb_cast_shell_command_line ""
20+
21+
exec $(dirname $0)/adb_command_line.py --name castshell-command-line "$@"
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/bin/bash
2+
#
3+
# Copyright 2015 The Chromium Authors. All rights reserved.
4+
# Use of this source code is governed by a BSD-style license that can be
5+
# found in the LICENSE file.
6+
7+
# If no flags are given, prints the current Chrome flags.
8+
#
9+
# Otherwise, the given flags are used to REPLACE (not modify) the Chrome
10+
# flags. For example:
11+
# adb_chrome_public_command_line --enable-webgl
12+
#
13+
# To remove all Chrome flags, pass an empty string for the flags:
14+
# adb_chrome_public_command_line ""
15+
16+
exec $(dirname $0)/adb_command_line.py --name chrome-command-line "$@"

0 commit comments

Comments
 (0)