slave/skia_slave_scripts/merge_into_android.py

#!/usr/bin/env python
# Copyright (c) 2014 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.


"""Merge Skia into Android."""


import os
import sys

from build_step import BuildStep, BuildStepWarning
import skia_vars
from sync_android import ANDROID_CHECKOUT_PATH, REPO
from utils.gclient_utils import GIT
from utils import misc
from utils import shell_utils

SKIA_REPO_URL = skia_vars.GetGlobalVariable('skia_git_url')
MASTER_SKIA_URL = ('https://googleplex-android-review.googlesource.com/'
                   'platform/external/skia')
MASTER_SKIA_REFS = 'HEAD:refs/heads/master-skia'

UPSTREAM_REMOTE_NAME = 'upstream'
UPSTREAM_BRANCH_NAME = UPSTREAM_REMOTE_NAME + '/master'

ANDROID_USER_CONFIG = 'include/core/SkUserConfig.h'
UPSTREAM_USER_CONFIG = 'include/config/SkUserConfig.h'

EXTERNAL_SKIA = os.path.join(ANDROID_CHECKOUT_PATH, 'external', 'skia')
# Path to gyp_to_android.py, relative to EXTERNAL_SKIA.
PLATFORM_TOOLS_BIN = os.path.join('platform_tools', 'android', 'bin')

LOCAL_BRANCH_NAME = 'merge'

class MergeIntoAndroid(BuildStep):
  """BuildStep which merges Skia into Android, with a generated Android.mk and
  SkUserConfig.h"""

  def _Run(self):
    with misc.ChDir(EXTERNAL_SKIA):

      # Set up git config properly.
      shell_utils.run([GIT, 'config', 'user.email',
                       '"31977622648@project.gserviceaccount.com"'])
      shell_utils.run([GIT, 'config', 'user.name',
                       '"Skia_Android Canary Bot"'])

      # Check to see whether there is an upstream yet.
      if not UPSTREAM_REMOTE_NAME in shell_utils.run([GIT, 'remote', 'show']):
        shell_utils.run([GIT, 'remote', 'add', UPSTREAM_REMOTE_NAME,
                         SKIA_REPO_URL])

      # Update the upstream remote.
      shell_utils.run([GIT, 'fetch', UPSTREAM_REMOTE_NAME])

      # Start the merge.
      try:
        shell_utils.run([GIT, 'merge', UPSTREAM_BRANCH_NAME, '--no-commit'])
      except shell_utils.CommandFailedException:
        # Merge conflict. There may be a more elegant solution, but for now,
        # undo the merge, and allow (/make) a human to do it.
        shell_utils.run([GIT, 'merge', '--abort'])
        raise Exception('Merge failed. Fall back to manual human merge.')

      # Grab the upstream version of SkUserConfig, which will be used to
      # generate Android's version.
      shell_utils.run([GIT, 'checkout', UPSTREAM_BRANCH_NAME, '--',
                       UPSTREAM_USER_CONFIG])

      # We don't want to commit the upstream version, so remove it from the
      # index.
      shell_utils.run([GIT, 'reset', 'HEAD', UPSTREAM_USER_CONFIG])

      # Now generate Android.mk and SkUserConfig.h
      sys.path.append(os.path.join(os.getcwd(), PLATFORM_TOOLS_BIN))
      import gyp_to_android
      gyp_to_android.main()
      shell_utils.run([GIT, 'add', 'Android.mk'])
      shell_utils.run([GIT, 'add', ANDROID_USER_CONFIG])
      shell_utils.run([GIT, 'add', os.path.join('tests', 'Android.mk')])
      shell_utils.run([GIT, 'add', os.path.join('bench', 'Android.mk')])
      shell_utils.run([GIT, 'add', os.path.join('gm', 'Android.mk')])
      shell_utils.run([GIT, 'add', os.path.join('dm', 'Android.mk')])

      # Remove upstream user config, which is no longer needed.
      shell_utils.run(['rm', UPSTREAM_USER_CONFIG])

      # Create a new branch.
      shell_utils.run([REPO, 'start', LOCAL_BRANCH_NAME, '.'])

      # Figure out the revision being merged, and use it to write the commit
      # message.
      revision = shell_utils.run([GIT, 'show', UPSTREAM_BRANCH_NAME,
                                  '--format="%H from %cD"', '-s'])
      # Remove trailing newline.
      revision.rstrip()

      try:
        shell_utils.run([GIT, 'commit', '-m', 'Merge Skia at ' + revision])
      except shell_utils.CommandFailedException:
        # It is possible that someone else already did the merge (for example,
        # if they are testing a build slave). Clean up and exit.
        shell_utils.run([REPO, 'abandon', LOCAL_BRANCH_NAME])
        raise BuildStepWarning('Nothing to merge; did someone already merge'
                               ' %s?' % revision)

      # Now push to master-skia branch
      shell_utils.run([GIT, 'push', MASTER_SKIA_URL, MASTER_SKIA_REFS])

      # Our branch is no longer needed. Remove it.
      shell_utils.run([REPO, 'sync', '-j32', '.'])
      shell_utils.run([REPO, 'prune', '.'])


if '__main__' == __name__:
  sys.exit(BuildStep.RunBuildStep(MergeIntoAndroid))