Android APK tests built from a normal WebRTC checkout.
Restructure how the Android APK tests are compiled now that we have a Chromium checkout available (since r6938). This removes the need of several hacks that were needed when building these targets from inside a Chromium checkout. By creating a symlink to Chromium's base we can compile the required targets. This also removes the need of the previously precompiled binaries we keep in /deps/tools/android at Google code. All the user needs to do is to add the target_os = ["android"] entry to his .gclient as described at https://code.google.com/p/chromium/wiki/AndroidBuildInstructions Before committing this CL, the Android APK buildbots will need to be updated. This also solves http://crbug.com/402594 since the apply_svn_patch.py usage will be similar to the other standalone bots. It also solves http://crbug.com/399297 BUG=chromium:399297, chromium:402594 TESTED=Locally compiled all APK targets by running: GYP_DEFINES="OS=android include_tests=1 enable_tracing=1" gclient runhooks ninja -C out/Release checkdeps R=henrike@webrtc.org, tommi@webrtc.org Review URL: https://webrtc-codereview.appspot.com/22149004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7014 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
56
PRESUBMIT.py
56
PRESUBMIT.py
@@ -7,6 +7,7 @@
|
||||
# be found in the AUTHORS file in the root of the source tree.
|
||||
|
||||
import re
|
||||
import sys
|
||||
|
||||
|
||||
def _CheckNoIOStreamInHeaders(input_api, output_api):
|
||||
@@ -112,6 +113,60 @@ def _CheckGypChanges(input_api, output_api):
|
||||
items=gyp_files))
|
||||
return result
|
||||
|
||||
def _CheckUnwantedDependencies(input_api, output_api):
|
||||
"""Runs checkdeps on #include statements added in this
|
||||
change. Breaking - rules is an error, breaking ! rules is a
|
||||
warning.
|
||||
"""
|
||||
# Copied from Chromium's src/PRESUBMIT.py.
|
||||
|
||||
# We need to wait until we have an input_api object and use this
|
||||
# roundabout construct to import checkdeps because this file is
|
||||
# eval-ed and thus doesn't have __file__.
|
||||
original_sys_path = sys.path
|
||||
try:
|
||||
sys.path = sys.path + [input_api.os_path.join(
|
||||
input_api.PresubmitLocalPath(), 'buildtools', 'checkdeps')]
|
||||
import checkdeps
|
||||
from cpp_checker import CppChecker
|
||||
from rules import Rule
|
||||
finally:
|
||||
# Restore sys.path to what it was before.
|
||||
sys.path = original_sys_path
|
||||
|
||||
added_includes = []
|
||||
for f in input_api.AffectedFiles():
|
||||
if not CppChecker.IsCppFile(f.LocalPath()):
|
||||
continue
|
||||
|
||||
changed_lines = [line for _line_num, line in f.ChangedContents()]
|
||||
added_includes.append([f.LocalPath(), changed_lines])
|
||||
|
||||
deps_checker = checkdeps.DepsChecker(input_api.PresubmitLocalPath())
|
||||
|
||||
error_descriptions = []
|
||||
warning_descriptions = []
|
||||
for path, rule_type, rule_description in deps_checker.CheckAddedCppIncludes(
|
||||
added_includes):
|
||||
description_with_path = '%s\n %s' % (path, rule_description)
|
||||
if rule_type == Rule.DISALLOW:
|
||||
error_descriptions.append(description_with_path)
|
||||
else:
|
||||
warning_descriptions.append(description_with_path)
|
||||
|
||||
results = []
|
||||
if error_descriptions:
|
||||
results.append(output_api.PresubmitError(
|
||||
'You added one or more #includes that violate checkdeps rules.',
|
||||
error_descriptions))
|
||||
if warning_descriptions:
|
||||
results.append(output_api.PresubmitPromptOrNotify(
|
||||
'You added one or more #includes of files that are temporarily\n'
|
||||
'allowed but being removed. Can you avoid introducing the\n'
|
||||
'#include? See relevant DEPS file(s) for details and contacts.',
|
||||
warning_descriptions))
|
||||
return results
|
||||
|
||||
|
||||
def _CommonChecks(input_api, output_api):
|
||||
"""Checks common to both upload and commit."""
|
||||
@@ -160,6 +215,7 @@ def _CommonChecks(input_api, output_api):
|
||||
results.extend(_CheckNoIOStreamInHeaders(input_api, output_api))
|
||||
results.extend(_CheckNoFRIEND_TEST(input_api, output_api))
|
||||
results.extend(_CheckGypChanges(input_api, output_api))
|
||||
results.extend(_CheckUnwantedDependencies(input_api, output_api))
|
||||
return results
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user