Skip to content

Commit 3748a10

Browse files
committed
Bump Android SDK tools to 3859397
* Update all pre-accepted licenses
1 parent b3b842b commit 3748a10

File tree

6 files changed

+16
-5
lines changed

6 files changed

+16
-5
lines changed

Dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ RUN dpkg --add-architecture i386 \
1111

1212
# Set up environment variables
1313
ENV ANDROID_HOME="/home/user/android-sdk-linux" \
14-
SDK_URL="https://dl.google.com/android/repository/tools_r25.2.5-linux.zip" \
14+
SDK_URL="https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip" \
1515
GRADLE_URL="https://services.gradle.org/distributions/gradle-3.3-all.zip"
1616

1717
# Create a non-root user
@@ -24,10 +24,11 @@ RUN mkdir "$ANDROID_HOME" .android \
2424
&& cd "$ANDROID_HOME" \
2525
&& curl -o sdk.zip $SDK_URL \
2626
&& unzip sdk.zip \
27-
&& rm sdk.zip \
28-
&& mkdir licenses \
29-
&& echo -n 8933bad161af4178b1185d1a37fbf41ea5269c55 \
30-
> licenses/android-sdk-license
27+
&& rm sdk.zip
28+
29+
# Accept all SDK licenses
30+
# Generated by $ANDROID_HOME/tools/bin/sdkmanager --licenses
31+
ADD licenses $ANDROID_HOME/licenses
3132

3233
# Install Gradle
3334
RUN wget $GRADLE_URL -O gradle.zip \

licenses/android-googletv-license

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
2+
601085b94cd77f0b54ff86406957099ebe79c4d6

licenses/android-sdk-license

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
2+
d56f5187479451eabf01fb78af6dfcb131a6481e
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
2+
84831b9409646a918e30573bab4c9c91346d8abd

licenses/google-gdk-license

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
2+
33b6a2b64607f11b759f320ef9dff4ae5c47d97a
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
2+
e9acab5b5fbb560a72cfaecce8946896ff6aab9d

0 commit comments

Comments
 (0)