From 82c91cc80d0f16a35367217c80dbe3d4fe112b91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Rodr=C3=ADguez=20Troiti=C3=B1o?= Date: Tue, 27 Nov 2018 10:51:05 -0800 Subject: [PATCH] Add missing option to CI preset for Android. Also, fix a typo in the build script instructions. --- utils/build-presets.ini | 1 + utils/build-script | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/utils/build-presets.ini b/utils/build-presets.ini index a00f12201bd99..512664e19293d 100644 --- a/utils/build-presets.ini +++ b/utils/build-presets.ini @@ -804,6 +804,7 @@ android-icu-uc=%(arm_dir)s/libicuucswift.so android-icu-uc-include=%(arm_dir)s/icu/source/common android-icu-i18n=%(arm_dir)s/libicui18nswift.so android-icu-i18n-include=%(arm_dir)s/icu/source/i18n +android-icu-data=%(arm_dir)s/libicudataswift.so # Ubuntu 18.04 preset for backwards compat and future customizations. [preset: buildbot_linux_1804] diff --git a/utils/build-script b/utils/build-script index 8afec0ff0bd4b..1c6f250527e7d 100755 --- a/utils/build-script +++ b/utils/build-script @@ -254,7 +254,7 @@ class BuildScriptInvocation(object): args.android_icu_data is None: diagnostics.fatal( "when building for Android, --android-ndk, " - "--android-ndk-version, --android-icu-uc, " + "--android-api-level, --android-icu-uc, " "--android-icu-uc-include, --android-icu-i18n, " "--android-icu-i18n-include, and --android-icu-data " "must be specified")