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

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

Issue 1415413005: Revert of [Android] Add a configurable environment for devil/. (RELAND) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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/apk_install.py ('k') | build/android/gyp/get_device_configuration.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/gyp/create_device_library_links.py
diff --git a/build/android/gyp/create_device_library_links.py b/build/android/gyp/create_device_library_links.py
index 6b0b24d75a671df727a797a08691d798c0f2298a..8c155a01f9ea27f2ef097f8201925f11a6b8b423 100755
--- a/build/android/gyp/create_device_library_links.py
+++ b/build/android/gyp/create_device_library_links.py
@@ -18,11 +18,9 @@
from util import build_device
from util import build_utils
-BUILD_ANDROID_DIR = os.path.abspath(
- os.path.join(os.path.dirname(__file__), '..'))
+BUILD_ANDROID_DIR = 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
@@ -98,17 +96,12 @@
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 = ['apk', 'libraries', 'script_host_path',
'script_device_path', 'target_dir', 'configuration_name']
build_utils.CheckOptions(options, parser, required=required_options)
constants.SetBuildType(options.configuration_name)
-
- devil_chromium.Initialize(
- output_directory=os.path.abspath(options.output_directory))
CreateSymlinkScript(options)
TriggerSymlinkScript(options)
« no previous file with comments | « build/android/gyp/apk_install.py ('k') | build/android/gyp/get_device_configuration.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698