android: Make buildbot able to use a custom manifest.

buildbot/buildbot_run.py

 #!/usr/bin/env python
 # Copyright (c) 2012 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 """Argument-less script to select what to run on the buildbots."""
 
 
+import filecmp
 import os
 import shutil
 import subprocess
 import sys
 
 
 if sys.platform in ['win32', 'cygwin']:
   EXE_SUFFIX = '.exe'
 else:
   EXE_SUFFIX = ''
@@ skipping 55 matching lines @@
 
 _ANDROID_SETUP = 'source build/envsetup.sh && lunch full-eng'
 
 
 def PrepareAndroidTree():
   """Prepare an Android tree to run 'android' format tests."""
   if os.environ['BUILDBOT_CLOBBER'] == '1':
     print '@@@BUILD_STEP Clobber Android checkout@@@'
     shutil.rmtree(ANDROID_DIR)
 
-  # The release of Android we use is static, so there's no need to do anything
-  # if the directory already exists.
-  if os.path.isdir(ANDROID_DIR):
+  # (Re)create the directory so that the following steps will succeed.
+  if not os.path.isdir(ANDROID_DIR):
+    os.mkdir(ANDROID_DIR)
+
+  # We use a manifest from the gyp project listing pinned revisions of AOSP to
+  # use, to ensure that we test against a stable target. This needs to be
+  # updated to pick up new build system changes sometimes, so we must test if
+  # it has changed.
+  manifest_filename = 'aosp_manifest.xml'
+  gyp_manifest = os.path.join(BUILDBOT_DIR, manifest_filename)
+  android_manifest = os.path.join(ANDROID_DIR, '.repo', 'manifests',
+                                  manifest_filename)
+  manifest_is_current = (os.path.isfile(android_manifest) and
+                         filecmp.cmp(gyp_manifest, android_manifest))
+  if not manifest_is_current:
+    # It's safe to repeat these steps, so just do them again to make sure we are
+    # in a good state.
+    print '@@@BUILD_STEP Initialize Android checkout@@@'
+    CallSubProcess(['git', 'config', '--global', 'user.name', 'trybot'])
+    CallSubProcess(['git', 'config', '--global',
+                    'user.email', 'chrome-bot@google.com'])
+    CallSubProcess(['git', 'config', '--global', 'color.ui', 'false'])
+    CallSubProcess(
+        ['repo', 'init',
+         '-u', 'https://android.googlesource.com/platform/manifest',
+         '-b', 'master',
+         '-g', 'all,-notdefault,-device,-darwin,-mips,-x86'],
+        cwd=ANDROID_DIR)
+    shutil.copy(gyp_manifest, android_manifest)
+
+    print '@@@BUILD_STEP Sync Android@@@'
+    CallSubProcess(['repo', 'sync', '-j4', '-m', manifest_filename],
+                   cwd=ANDROID_DIR)
+
+  # If we already built the system image successfully and didn't sync to a new
+  # version of the source, skip running the build again as it's expensive even
+  # when there's nothing to do.
+  system_img = os.path.join(ANDROID_DIR, 'out', 'target', 'product', 'generic',
+                            'system.img')
+  if manifest_is_current and os.path.isfile(system_img):
     return
 
-  print '@@@BUILD_STEP Initialize Android checkout@@@'
-  os.mkdir(ANDROID_DIR)
-  CallSubProcess(['git', 'config', '--global', 'user.name', 'trybot'])
-  CallSubProcess(['git', 'config', '--global',
-                  'user.email', 'chrome-bot@google.com'])
-  CallSubProcess(['git', 'config', '--global', 'color.ui', 'false'])
-  CallSubProcess(
-      ['repo', 'init',
-       '-u', 'https://android.googlesource.com/platform/manifest',
-       '-b', 'android-4.2.1_r1',
-       '-g', 'all,-notdefault,-device,-darwin,-mips,-x86'],
-      cwd=ANDROID_DIR)
-
-  print '@@@BUILD_STEP Sync Android@@@'
-  CallSubProcess(['repo', 'sync', '-j4'], cwd=ANDROID_DIR)
-
   print '@@@BUILD_STEP Build Android@@@'
   CallSubProcess(
       ['/bin/bash',
        '-c', '%s && make -j4' % _ANDROID_SETUP],
       cwd=ANDROID_DIR)
 
 
 def StartAndroidEmulator():
   """Start an android emulator from the built android tree."""
   print '@@@BUILD_STEP Start Android emulator@@@'
-  android_host_bin = '$ANDROID_HOST_OUT/bin'

[jbudorick, 2014/07/31 21:40:34]

What happened here?

[Torne, 2014/08/01 09:57:42]

The emulator is no longer built from source in current Android versions, it's a
prebuilt, and thus there is no "emulator" binary in $ANDROID_HOST_OUT/bin.
envsetup.sh has added all relevant directories to the PATH anyway so running
"emulator" or "adb" unqualified works.

   subprocess.Popen(
       ['/bin/bash', '-c',
-       '%s && %s/emulator -no-window' % (_ANDROID_SETUP, android_host_bin)],
+       '%s && emulator -no-window' % _ANDROID_SETUP],
       cwd=ANDROID_DIR)
   CallSubProcess(
       ['/bin/bash', '-c',
-       '%s && %s/adb wait-for-device' % (_ANDROID_SETUP, android_host_bin)],
+       '%s && adb wait-for-device' % _ANDROID_SETUP],
       cwd=ANDROID_DIR)
 
 
 def StopAndroidEmulator():
   """Stop all android emulators."""
   print '@@@BUILD_STEP Stop Android emulator@@@'
   # If this fails, it's because there is no emulator running.
   subprocess.call(['pkill', 'emulator.*'])
 
 
@@ skipping 80 matching lines @@
     # TODO(bradnelson): once the annotator supports a postscript (section for
     #     after the build proper that could be used for cumulative failures),
     #     use that instead of this. This isolates the final return value so
     #     that it isn't misattributed to the last stage.
     print '@@@BUILD_STEP failures@@@'
     sys.exit(retcode)
 
 
 if __name__ == '__main__':
   GypBuild()