commit | 05ec58e98144a36d48e0f5ae4164e004455fc72d | [log] [tgz] |
---|---|---|
author | Raluca Sauciuc <ralucas@google.com> | Wed Oct 04 09:19:49 2017 -0700 |
committer | Raluca Sauciuc <ralucas@google.com> | Wed Oct 04 18:14:35 2017 +0000 |
tree | f46149c61b9ed63be14f6c5f84f2456f6aae6778 | |
parent | 01eed1fb5be0c7636e7a54a71660d0f347b17186 [diff] |
Update OS X JDK prebuilts This builds 1.8.0_152-release-915-b8 from JetBrains' sources in platform/external/jetbrains/jdk8u*, at revisions: $ repo forall -p -c git rev-parse hEAD project external/jetbrains/jdk8u/ f626a6b4854cea8b260ee443c43f6d1bdad2e4f0 project external/jetbrains/jdk8u_corba/ c55762da91519a85fb2fd0b4f415735a12cc4888 project external/jetbrains/jdk8u_hotspot/ b3d0f5fb7c25aab20ca070e17486c8a54a0088dd project external/jetbrains/jdk8u_jaxp/ ad06f386190d159fe7bc8202b3abae2f1b218ecd project external/jetbrains/jdk8u_jaxws/ 1608370faaf8ca1655f5442d66d2cfd6282747c7 project external/jetbrains/jdk8u_jdk/ 42d59429009c06fb4d6ab5cf71a038d4c614bd71 project external/jetbrains/jdk8u_langtools/ fe8ba49ea8854950d9d756b7b2ac937c4a3f9577 project external/jetbrains/jdk8u_nashorn/ 45faba88ae10e979db10142c68d02d986018010a Bug: 65750921 Test: N/A Change-Id: Ib4e81e09e7f4135c2ee527d8859770ce1eef7950 (cherry picked from commit 6d3970244d8b0ad3ea80d1121b5563d52b7ea734)
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.
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.
repo init -u persistent-https://googleplex-android.git.corp.google.com/platform/manifest -b openjdk repo sync # Do not use '-c' here
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
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
repo forall -c ./merge2.sh
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
repo forall -c git checkout aosp/studio-master-dev-osx
.repo forall -c git checkout goog/mirror-studio-master-dev-osx