Lines Matching refs:from

1 If you want to import files from the OpenJDK into `libcore/`, you are reading
12 The general idea is to get a change from OpenJDK into libcore in AOSP by
13 `git merge` from an OpenJDK branch. However, each file in `ojluni/` can come
14 from a different OpenJDK version. `expected_upstream` is a staging branch
16 we update an `ojluni/` file from a new upstream version, and the command should
47 `ojluni_merge_to_main` will `git-merge` from the upstream branch.
68 ## 2a. Add a java test from the upstream
109 1. Add or upgrade a file from the upstream OpenJDK
111       import the file from the upstream. Later, you can merge the file and
113 2. Remove an `ojluni/` file that originally came from the OpenJDK
116 3. Revert the merge commit on `aosp/main` from `expected_upstream`
136 3. Cherry-picking a commit from upstream
141     * Files, e.g. Android.bp, don't come from the upstream. You can make the
161 2. `Code-review +2` on all 5 CLs from an Android Core Library team member
162 3. If needed, `API-review +1` on commit `E` from an Android API council member
165         * Otherwise, gerrit will create another merge commit from `A` without