tag	e32de160c7cbc41b082a32c495f3d9c399a4d49c
tagger	The Android Open Source Project <initial-contribution@android.com>	Fri Mar 10 10:12:31 2017 -0800
object	86e5bc5da8c3559e66f25f2221840c8db7efa065

Studio 2.3

commit	86e5bc5da8c3559e66f25f2221840c8db7efa065	[log] [tgz]
author	Raluca Sauciuc <ralucas@google.com>	Tue Dec 06 12:22:24 2016 -0800
committer	Raluca Sauciuc <ralucas@google.com>	Tue Dec 13 01:13:26 2016 +0000
tree	96210c8130c59d612759016877c90797bc4ce953
parent	91544d9df503cc097f47293d41ef531728e0d01c [diff]

Update JDK prebuilts

This builds 1.8.0_112-release-b06 from JetBrains' sources in
platform/external/jetbrains/jdk8u*, at revisions:

$ repo forall -p -c git rev-parse HEAD
project external/jetbrains/jdk8u/
d5844018c62b5f063bff069989f85305a4bc0d63

project external/jetbrains/jdk8u_corba/
c623ef97a5e99bfcc53f3fb0f53eaf8338adda9d

project external/jetbrains/jdk8u_hotspot/
6dc5205ab97b5dc48533db2433c38f0e6c03f56b

project external/jetbrains/jdk8u_jaxp/
07a190d0f25d6abc8b425751b7b6f2a562c56743

project external/jetbrains/jdk8u_jaxws/
7081f557de89b5eba9f7f9f148ecdd01057a7b9a

project external/jetbrains/jdk8u_jdk/
1c431f37cfe5ef16fddf3d7ffdd461aebf0aba2f

project external/jetbrains/jdk8u_langtools/
c227d90524ae4295137e98712ea6aa81f8d232d4

project external/jetbrains/jdk8u_nashorn/
ec3fecc6e531797f5525c3fd32fe547ea591f0ea

Bug: http://b.android.com/230086
Test: N/A
Change-Id: I7c487f9e28634addf3cec154f4982ca0c19939f5
(cherry picked from commit 32d41deb7d8a341442aa03f6f5ba3ca12065ed9d)

416 files changed

tree: 96210c8130c59d612759016877c90797bc4ce953

README.md

Importing upstream changes

This document describes how to import changes from upstream repo (https://github.com/JetBrains/jdk8u*.git). Before doing these, you need forge-author, forge-committer and direct-push permissions for the relevant projects in jetbrains-master-mirror and jetbrains-master-mirror-osx branches.

Overview

JetBrains's projects have two branches - master and master-osx that we need to track. The master branch is used for linux and windows. The master-osx branch is used for mac. These map to jetbrains-master-mirror and jetbrains-master-mirror-osx respectively in our tree. No change should be made directly to these branches and they should track the upstream bit-for-bit. After importing the changes from jetbrains into these mirror branches, we can merge them into studio-master-dev and studio-master-dev-osx. Any changes made by us, should be made to studio-master-dev.

There is an auto-merger from studio-master-dev to studio-master-dev-osx. So, any change made should be available for both branches.

Steps

Get the sources by cloning the repo

repo init -u https://android-googlesource.com/platform/manifest -b openjdk
repo sync  # Do not use '-c' here

Create a script called merge.sh with the following contents and grant it execute permissions:

#!/bin/bash
PROJECT_NAME=$(basename $REPO_PROJECT)

# Make sure we're in a clean state.
git checkout aosp/studio-master-dev # to make sure local_copy isn't checked out
git branch -D local_copy local_copy-osx

# Fetch changes and push to jetbrains-master-mirror.
git fetch https://github.com/JetBrains/$PROJECT_NAME.git master:local_copy
git fetch https://github.com/JetBrains/$PROJECT_NAME.git master-osx:local_copy-osx
git push aosp local_copy:refs/heads/jetbrains-master-mirror
git push aosp local_copy-osx:refs/heads/jetbrains-master-mirror-osx

# Merge the mirror into studio-master-dev and upload to gerrit
COMMIT_MSG="Merge 'jetbrains-master-mirrorSUFFIX' into studio-master-devSUFFIX" # edit as needed.
git branch -D studio-master-dev studio-master-dev-osx
git checkout -b studio-master-dev -t aosp/studio-master-dev
git merge -m "${COMMIT_MSG//SUFFIX/}" local_copy
repo upload --br=studio-master-dev $REPO_PROJECT

Run:

repo forall -c ./merge.sh # assuming merge.sh is in the current dir.

The above should create a merge CL per project that you can review in gerrit and submit.
There is an auto-merger from studio-master-dev to studio-master-dev-osx. Once the merge submitted above has merged into studio-master-dev-osx, continue with the following steps.
Create another file called merge2.sh with the followning contents and grant it execute permissions:

#!/bin/bash
COMMIT_MSG="Merge 'jetbrains-master-mirrorSUFFIX' into studio-master-devSUFFIX" # edit as needed.
git checkout -b studio-master-dev-osx -t aosp/studio-master-dev-osx
git merge -m "${COMMIT_MSG//SUFFIX/-osx}" local_copy-osx
repo upload --br=studio-master-dev-osx -D studio-master-dev-osx $REPO_PROJECT

Run:

repo forall -c ./merge2.sh

This should generate more CLs for you to merge through gerrit.

ProTip

You can add the following lines to ~/.gitconfig to skip “are you sure you want to upload” question from repo.

[review "https://android-review.googlesource.com/"]
        autoupload = true

Building

TODO: add instructions to build linux and win binaries.
To build mac binaries, checkout the project and sync (don't use the ‘-c’ flag when syncing).
Checkout the mac branch: repo forall -c git checkout aosp/studio-master-dev-osx.
You can now build the mac binaries.
To build from the internal tree, checkout the tree in the same way as aosp.
For mac binaries run the following after checking out the tree repo forall -c git checkout goog/mirror-studio-master-dev-osx