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

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

Issue 1416703003: [Android] Add a configurable environment for devil/. (RELAND 2) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years 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/devil_chromium.py ('k') | build/android/gyp/create_device_library_links.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/gyp/apk_install.py
diff --git a/build/android/gyp/apk_install.py b/build/android/gyp/apk_install.py
index 33697cace69c9e9341572fa7f69242c6585fac5c..9c9076384c8baf3252302feb4542df58cd18c0e4 100755
--- a/build/android/gyp/apk_install.py
+++ b/build/android/gyp/apk_install.py
@@ -17,9 +17,11 @@ from util import build_device
from util import build_utils
from util import md5_check
-BUILD_ANDROID_DIR = os.path.join(os.path.dirname(__file__), '..')
+BUILD_ANDROID_DIR = os.path.abspath(
+ os.path.join(os.path.dirname(__file__), '..'))
sys.path.append(BUILD_ANDROID_DIR)
+import devil_chromium
from devil.android import apk_helper
from pylib import constants
@@ -74,15 +76,20 @@ def main():
help='Path to touch on success.')
parser.add_option('--configuration-name',
help='The build CONFIGURATION_NAME')
+ parser.add_option('--output-directory',
+ help='The output directory.')
options, _ = parser.parse_args()
+ constants.SetBuildType(options.configuration_name)
+
+ devil_chromium.Initialize(
+ output_directory=os.path.abspath(options.output_directory))
+
device = build_device.GetBuildDeviceFromPath(
options.build_device_configuration)
if not device:
return
- constants.SetBuildType(options.configuration_name)
-
serial_number = device.GetSerialNumber()
apk_package = apk_helper.GetPackageName(options.apk_path)
« no previous file with comments | « build/android/devil_chromium.py ('k') | build/android/gyp/create_device_library_links.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698