Updated to arc-runtime-45.5021.427.0
diff --git a/src/build/DEPS.arc-int b/src/build/DEPS.arc-int
index f7382fd..a06016a 100644
--- a/src/build/DEPS.arc-int
+++ b/src/build/DEPS.arc-int
@@ -1 +1 @@
-8a14d399a8514a1dd0e08ca09632f74a190b4dc6
+723231ba334ed936f26370fc03e8f4b2b5ca4b03
diff --git a/src/build/configure.py b/src/build/configure.py
index fefcb03..6947e64 100755
--- a/src/build/configure.py
+++ b/src/build/configure.py
@@ -307,10 +307,9 @@
def _set_up_internal_repo():
if OPTIONS.internal_apks_source() == 'internal':
- # Check if internal/third_party/{gms-core, google-contacts-sync-adapter}/
- # checkout, which requires manual sync for now, is consistent with
- # internal/build/DEPS.*.xml.
- subprocess.check_call('src/build/check_arc_int.py')
+ # Sync internal/third_party/* to internal/build/DEPS.*. The files needs to
+ # be re-staged and is done in staging.create_staging.
+ subprocess.check_call('src/build/sync_arc_int.py')
# Create a symlink to the integration_test definition directory, either in the
# internal repository checkout or in the downloaded archive.
diff --git a/src/build/ninja_generator.py b/src/build/ninja_generator.py
index 210bfbc..e077132 100644
--- a/src/build/ninja_generator.py
+++ b/src/build/ninja_generator.py
@@ -91,7 +91,7 @@
'src/build/DEPS.ndk',
'src/build/build_common.py',
'src/build/build_options.py',
- 'src/build/check_arc_int.py',
+ 'src/build/sync_arc_int.py',
'src/build/config.py',
'src/build/config_loader.py',
'src/build/config_runner.py',
diff --git a/src/build/check_arc_int.py b/src/build/sync_arc_int.py
similarity index 67%
rename from src/build/check_arc_int.py
rename to src/build/sync_arc_int.py
index c2341b2..a689097 100755
--- a/src/build/check_arc_int.py
+++ b/src/build/sync_arc_int.py
@@ -4,22 +4,21 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
#
-# This script checks if both our code in internal/ and the Android internal
-# checkout in the directory are up to date.
+# This script syncs our code in internal/ to DEPS.arc-int, and the Android
+# internal repos to DEPS.*.xml.
import logging
import os
import subprocess
import sys
-import tempfile
+
import util.git
+from build_options import OPTIONS
_SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
_ARC_ROOT = os.path.dirname(os.path.dirname(_SCRIPT_DIR))
_ARC_INTERNAL_DIR = os.path.join(_ARC_ROOT, 'internal')
_DEPS_FILE = os.path.join(_ARC_ROOT, 'src/build/DEPS.arc-int')
-_GMS_CORE_DIR = os.path.join(_ARC_INTERNAL_DIR, 'third_party/gms-core')
-_GMS_CORE_DEPS = os.path.join(_ARC_INTERNAL_DIR, 'build/DEPS.gms.xml')
def _get_current_arc_int_revision():
@@ -40,6 +39,9 @@
def run():
+ OPTIONS.parse_configure_file()
+ assert OPTIONS.internal_apks_source() == 'internal'
+
# Check if internal/ exists. Run git-clone if not.
if not os.path.isdir(_ARC_INTERNAL_DIR):
# TODO(tandrii): Move this nacl-x86_64-bionic-internal recipe's botupdate
@@ -61,19 +63,9 @@
if target_revision != _get_current_arc_int_revision():
sync_repo(target_revision)
- # Check if the Android internal code is up to date.
- xml = tempfile.NamedTemporaryFile(prefix='repo_manifest_output_')
- # 'repo manifest' does not access the internal Android code repository.
- subprocess.check_call('repo manifest -o %s -r' % xml.name,
- cwd=_GMS_CORE_DIR, shell=True)
+ subprocess.check_call(os.path.join(_ARC_INTERNAL_DIR, 'build/configure.py'))
- result = subprocess.call(['diff', xml.name, _GMS_CORE_DEPS])
- if result != 0:
- logging.error('Android internal source code is not up to date. Please run '
- 'internal/build/configure.py to update the code. If you are '
- 'trying to sync on buildbot, please refer to '
- 'internal/docs/rebasing.md')
- return result
+ return 0
if __name__ == '__main__':
