Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(756)

Unified Diff: build/android/gyp/push_libraries.py

Issue 1571803002: [Android] Prepare build/android/ for catapult+devil. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@create-device-library-links
Patch Set: rebase Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/gyp/jinja_template.py ('k') | build/android/gyp/util/build_device.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/gyp/push_libraries.py
diff --git a/build/android/gyp/push_libraries.py b/build/android/gyp/push_libraries.py
index e1a01d7d79151c3f7dce26a7e21088ed21e715d9..3dae6f0d71f092dcee35c94dc20aaf5a6b1e079e 100755
--- a/build/android/gyp/push_libraries.py
+++ b/build/android/gyp/push_libraries.py
@@ -12,16 +12,17 @@ import optparse
import os
import sys
+from util import build_device
+from util import build_utils
+from util import md5_check
+
BUILD_ANDROID_DIR = os.path.abspath(
os.path.join(os.path.dirname(__file__), os.pardir))
sys.path.append(BUILD_ANDROID_DIR)
+import devil_chromium
from pylib import constants
-from util import build_device
-from util import build_utils
-from util import md5_check
-
def DoPush(options):
libraries = build_utils.ParseGypList(options.libraries)
@@ -63,13 +64,15 @@ def main(args):
parser.add_option('--stamp', help='Path to touch on success.')
parser.add_option('--build-device-configuration',
help='Path to build device configuration.')
- parser.add_option('--configuration-name',
- help='The build CONFIGURATION_NAME')
+ parser.add_option('--output-directory',
+ help='The output directory.')
options, _ = parser.parse_args(args)
required_options = ['libraries', 'device_dir', 'libraries']
build_utils.CheckOptions(options, parser, required=required_options)
- constants.SetBuildType(options.configuration_name)
+
+ devil_chromium.Initialize(
+ output_directory=os.path.abspath(options.output_directory))
DoPush(options)
« no previous file with comments | « build/android/gyp/jinja_template.py ('k') | build/android/gyp/util/build_device.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698