diff options
| author |  Xudong Ma <simonma@google.com> | 2015-05-21 23:06:51 -0700 |
|---|---|---|
| committer | Xudong Ma <simonma@google.com> | 2015-05-21 23:06:51 -0700 |
| commit | 2178c134de298e5d5a5868a83f33ccdf06136c0d (patch) | |
| tree | e737e5e335d4768acd8df7863254f8e743e30e47 /tools | |
| parent | 35d9fcffc43024a960588568f4363639f19d07bd (diff) | |
| parent | 12ef17cbcd280dd47ef5d20e09acd125f1fd6ac9 (diff) | |
Merge pull request #1719 from madongfly/android_docker
Add two more AVD for api level 21 and 19.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dockerfile/grpc_java_android/Dockerfile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/dockerfile/grpc_java_android/Dockerfile b/tools/dockerfile/grpc_java_android/Dockerfile index d11e88943c..2dc2202e9d 100644 --- a/tools/dockerfile/grpc_java_android/Dockerfile +++ b/tools/dockerfile/grpc_java_android/Dockerfile @@ -44,10 +44,13 @@ ENV PATH $PATH:$ANDROID_HOME/platform-tools ENV HOME /root # Update sdk for android 5.1 (API level 22) -RUN echo y | android update sdk --all --filter platform-tools,build-tools-22.0.1,sys-img-armeabi-v7a-android-22,android-22,extra-android-m2repository,extra-google-m2repository --no-ui --force +RUN echo y | android update sdk --all --filter platform-tools,build-tools-22.0.1,sys-img-armeabi-v7a-addon-google_apis-google-22,sys-img-armeabi-v7a-addon-google_apis-google-21,sys-img-armeabi-v7a-android-19,addon-google_apis-google-22,addon-google_apis-google-21,addon-google_apis-google-19,extra-android-m2repository,extra-google-m2repository --no-ui --force + # Create an AVD with API level 22 -RUN echo no | android create avd --force -n avd-api-22 -t android-22 +RUN echo no | android create avd --force -n avd-google-api-22 -t "Google Inc.:Google APIs:22" --abi google_apis/armeabi-v7a +RUN echo no | android create avd --force -n avd-google-api-21 -t "Google Inc.:Google APIs:21" --abi google_apis/armeabi-v7a +RUN echo no | android create avd --force -n avd-google-api-19 -t "Google Inc.:Google APIs:19" --abi default/armeabi-v7a # Pull gRPC Java and trigger download of needed Maven and Gradle artifacts. RUN git clone --depth 1 https://github.com/grpc/grpc-java.git /var/local/git/grpc-java && \ |