diff options
| author | Siyamed Sinir <siyamed@google.com> | 2018-01-10 23:09:04 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-10 23:09:04 +0000 |
| commit | 3ca6b140209c81cabf731a333153d8e808a30fb6 (patch) | |
| tree | 56a770726a021582557ab887e80525c555a7fbb6 | |
| parent | 7cc258f812993b8981f0e6fc341cb6997ab37379 (diff) | |
| parent | 90b61de3644476ae9ea1d4ef32c368c9531e438f (diff) | |
| download | freetype-3ca6b140209c81cabf731a333153d8e808a30fb6.tar.gz | |
Merge "Update README.android to include how to sync to upstream" am: 53a14993d9 am: f9a862a616
am: 90b61de364
Change-Id: Iadb72c31539d5d3f0c5a2e88e46096f3ddd67cdb
| -rw-r--r-- | README.android | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/README.android b/README.android index d97d32d1b..752fd6e62 100644 --- a/README.android +++ b/README.android @@ -20,4 +20,15 @@ The following options are disabled in include/freetype/config/ftoption.h: The following option is enabled to support color fonts. - FT_CONFIG_OPTION_USE_PNG
\ No newline at end of file + FT_CONFIG_OPTION_USE_PNG + +HOW TO UPDATE +* Check out external/freetype to <checkout_dir> + ex: git clone https://android.googlesource.com/platform/external/freetype +* Locate the commit you'd like to move. + ex: for 2.8.1: http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?h=VER-2-8-1&id=39ce3ac499d4cd7371031a062f410953c8ecce29 +* In <checkout_dir>, run git merge <commit_sha> + i.e. git merge 39ce3ac499d4cd7371031a062f410953c8ecce29 +* Upload the changes. + ex: git push origin HEAD:refs/for/master +* Gerrit will run the text related tests. |