diff options
| author | Mark Spruiell <mes@zeroc.com> | 2017-07-19 14:21:01 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2017-07-19 14:21:01 -0700 |
| commit | a6f1adeeb1775e86ba34a911d3a5ec07109672cf (patch) | |
| tree | c05a0a923bedc0d1c15715a689854a68f24a31fc /java | |
| parent | ICE-8368 - js glacier2/router / C++ fails with IE and Windows 7 (diff) | |
| download | ice-a6f1adeeb1775e86ba34a911d3a5ec07109672cf.tar.bz2 ice-a6f1adeeb1775e86ba34a911d3a5ec07109672cf.tar.xz ice-a6f1adeeb1775e86ba34a911d3a5ec07109672cf.zip | |
ICE-8362 - updating Android test projects
Diffstat (limited to 'java')
| -rw-r--r-- | java/android/BuildInstructions.md | 17 | ||||
| -rw-r--r-- | java/android/gradle.properties | 6 |
2 files changed, 12 insertions, 11 deletions
diff --git a/java/android/BuildInstructions.md b/java/android/BuildInstructions.md index e02903d05d4..0998b88f14e 100644 --- a/java/android/BuildInstructions.md +++ b/java/android/BuildInstructions.md @@ -18,7 +18,7 @@ Building any Ice application for Android requires Android Studio and the Android SDK build tools. We tested with the following components: - Android Studio 3.0 preview -- Android SDK 25 +- Android SDK 24 - Android Build Tools 26.0.0 Using Ice's Java mapping with Java 8 requires at minimum API level 24: @@ -32,6 +32,8 @@ suite, edit `gradle.properties` and change the following variables: ice_minSdkVersion ice_targetSdkVersion +*NOTE: Do not use Android Studio to modify the project's settings.* + ### Slice to Java Compiler To build this project you'll need the Slice to Java compiler, which generates @@ -60,13 +62,12 @@ therefore add significant latency to Ice requests.* ## Building the Project -Follow these steps to import the Ice for Android project into Android Studio: +Follow these steps to open the project in Android Studio: 1. Start Android Studio -2. Select Open Project -3. Navigate to the android subdirectory -4. If presented with an "Import Project from Gradle" dialog, select - "Use default gradle wrapper" and press OK +2. Select "Open an existing Android Studio project" +3. Navigate to and select the "android" subdirectory +4. Click OK and wait for the project to open and build The Android Studio project contains a `testController` application for the Ice test suite. To run the application, select it in the configuration pull down and @@ -87,8 +88,8 @@ directories of Android SDK to the PATH. The Instant Run feature of Android Studio causes some problems with the test suite application and you need to disable it in order to run the test controller -application from the Android Studio, check the following page for instructions -to disable it: +application from Android Studio. Check the following page for instructions on +disabling it: https://developer.android.com/studio/run/index.html#disable-ir diff --git a/java/android/gradle.properties b/java/android/gradle.properties index fd1ff552539..8fe5f0e63f8 100644 --- a/java/android/gradle.properties +++ b/java/android/gradle.properties @@ -19,9 +19,9 @@ prefixVersion = 3.7.0 // The Android versions used for the Ice build. ice_buildToolsVersion = 26.0.0 -ice_compileSdkVersion = 25 -ice_minSdkVersion = 25 -ice_targetSdkVersion = 25 +ice_compileSdkVersion = 24 +ice_minSdkVersion = 24 +ice_targetSdkVersion = 24 // // Set iceHome to location of Ice installation if Ice was installed in a |