Raise Android API version from 21 to 26

mwswartwout · mwswartwout · commit 85a6cd371418 · 2023-03-28T08:19:59.000-07:00
diff --git a/build/config/android/config.gni b/build/config/android/config.gni
@@ -20,5 +20,5 @@ declare_args() {
   android_ndk_root = ""
 
   # Version of the Android SDK.
-  android_sdk_version = 21
+  android_sdk_version = 26
 }
diff --git a/examples/tv-app/android/BUILD.gn b/examples/tv-app/android/BUILD.gn
@@ -151,11 +151,11 @@ android_library("java") {
   javac_flags = [ "-Xlint:deprecation" ]
 
   # TODO: add classpath support (we likely need to add something like
-  #  ..../platforms/android-21/android.jar to access BLE items)
+  #  ..../platforms/android-26/android.jar to access BLE items)
 }
 
 java_prebuilt("android") {
-  jar_path = "${android_sdk_root}/platforms/android-21/android.jar"
+  jar_path = "${android_sdk_root}/platforms/android-26/android.jar"
 }
 
 group("default") {
diff --git a/examples/tv-casting-app/android/BUILD.gn b/examples/tv-casting-app/android/BUILD.gn
@@ -86,11 +86,11 @@ android_library("java") {
   javac_flags = [ "-Xlint:deprecation" ]
 
   # TODO: add classpath support (we likely need to add something like
-  #  ..../platforms/android-21/android.jar to access BLE items)
+  #  ..../platforms/android-26/android.jar to access BLE items)
 }
 
 java_prebuilt("android") {
-  jar_path = "${android_sdk_root}/platforms/android-21/android.jar"
+  jar_path = "${android_sdk_root}/platforms/android-26/android.jar"
 }
 
 group("default") {
diff --git a/gn_build.sh b/gn_build.sh
@@ -126,7 +126,7 @@ else
     echo
     echo "Hint: Set \$ANDROID_HOME and \$ANDROID_NDK_HOME to enable building for Android"
     echo "      The required android sdk platform version is 21. It can be obtained from"
-    echo "      https://dl.google.com/android/repository/android-21_r02.zip"
+    echo "      https://dl.google.com/android/repository/platform-26_r02.zip"
 fi
 
 echo
diff --git a/integrations/docker/images/chip-build-android/Dockerfile b/integrations/docker/images/chip-build-android/Dockerfile
@@ -15,14 +15,14 @@ RUN set -x \
 
 # Download and install android SDK
 RUN set -x \
-    && wget -O /tmp/android-21.zip https://dl.google.com/android/repository/android-21_r02.zip \
+    && wget -O /tmp/android-26.zip https://dl.google.com/android/repository/platform-26_r02.zip \
     && mkdir -p /opt/android/sdk/platforms \
     && cd /opt/android/sdk/platforms \
-    && unzip /tmp/android-21.zip \
-    && mv android-5.0.1 android-21 \
-    && rm -f /tmp/android-21.zip \
+    && unzip /tmp/android-26.zip \
+    && mv android-5.0.1 android-26 \
+    && rm -f /tmp/android-26.zip \
     && chmod -R a+rX /opt/android/sdk \
-    && test -d /opt/android/sdk/platforms/android-21 \
+    && test -d /opt/android/sdk/platforms/android-26 \
     && : # last line
 
 # Download and install android command line tool (for installing `sdkmanager`)
@@ -57,9 +57,9 @@ RUN set -x \
     && export PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH \
     && cd /tmp && wget https://www.openssl.org/source/openssl-1.1.1g.tar.gz \
     && mkdir -p $OPENSSL_ARMV7 && cd $OPENSSL_ARMV7 && tar xfz /tmp/openssl-1.1.1g.tar.gz \
-    && cd $OPENSSL_ARMV7/openssl-1.1.1g && CC=clang ANDROID_API=21 ./Configure android-arm -D__ANDROID_API__=21 && make SHLIB_VERSION_NUMBER= SHLIB_EXT=.so \
+    && cd $OPENSSL_ARMV7/openssl-1.1.1g && CC=clang ANDROID_API=26 ./Configure android-arm -D__ANDROID_API__=26 && make SHLIB_VERSION_NUMBER= SHLIB_EXT=.so \
     && mkdir -p $OPENSSL_X86 && cd $OPENSSL_X86 && tar xfz /tmp/openssl-1.1.1g.tar.gz \
-    && cd $OPENSSL_X86/openssl-1.1.1g && CC=clang ANDROID_API=21 ./Configure android-x86 -D__ANDROID_API__=21 && make SHLIB_VERSION_NUMBER= SHLIB_EXT=.so \
+    && cd $OPENSSL_X86/openssl-1.1.1g && CC=clang ANDROID_API=26 ./Configure android-x86 -D__ANDROID_API__=26 && make SHLIB_VERSION_NUMBER= SHLIB_EXT=.so \
     && rm -rf /tmp/OpenSSL_1_1_1g.zip \
     && : # last line
 
diff --git a/src/app/server/java/BUILD.gn b/src/app/server/java/BUILD.gn
@@ -70,9 +70,9 @@ android_library("java") {
   javac_flags = [ "-Xlint:deprecation" ]
 
   # TODO: add classpath support (we likely need to add something like
-  #  ..../platforms/android-21/android.jar to access BLE items)
+  #  ..../platforms/android-26/android.jar to access BLE items)
 }
 
 java_prebuilt("android") {
-  jar_path = "${android_sdk_root}/platforms/android-21/android.jar"
+  jar_path = "${android_sdk_root}/platforms/android-26/android.jar"
 }
diff --git a/src/controller/java/BUILD.gn b/src/controller/java/BUILD.gn
@@ -286,7 +286,7 @@ android_library("java") {
   ]
 
   # TODO: add classpath support (we likely need to add something like
-  #  ..../platforms/android-21/android.jar to access BLE items)
+  #  ..../platforms/android-26/android.jar to access BLE items)
 }
 
 if (chip_link_tests) {
@@ -318,7 +318,7 @@ if (chip_link_tests) {
     javac_flags = [ "-Xlint:deprecation" ]
 
     # TODO: add classpath support (we likely need to add something like
-    #  ..../platforms/android-21/android.jar to access BLE items)
+    #  ..../platforms/android-26/android.jar to access BLE items)
   }
 
   android_library("tests") {
@@ -353,12 +353,12 @@ if (chip_link_tests) {
     javac_flags = [ "-Xlint:deprecation" ]
 
     # TODO: add classpath support (we likely need to add something like
-    #  ..../platforms/android-21/android.jar to access BLE items)
+    #  ..../platforms/android-26/android.jar to access BLE items)
   }
 }
 
 if (!build_java_matter_controller) {
   java_prebuilt("android") {
-    jar_path = "${android_sdk_root}/platforms/android-21/android.jar"
+    jar_path = "${android_sdk_root}/platforms/android-26/android.jar"
   }
 }
diff --git a/src/messaging/tests/java/BUILD.gn b/src/messaging/tests/java/BUILD.gn
@@ -70,11 +70,11 @@ android_library("java") {
   javac_flags = [ "-Xlint:deprecation" ]
 
   # TODO: add classpath support (we likely need to add something like
-  #  ..../platforms/android-21/android.jar to access BLE items)
+  #  ..../platforms/android-26/android.jar to access BLE items)
 }
 
 if (!build_java_matter_controller) {
   java_prebuilt("android") {
-    jar_path = "${android_sdk_root}/platforms/android-21/android.jar"
+    jar_path = "${android_sdk_root}/platforms/android-26/android.jar"
   }
 }
diff --git a/src/platform/android/BUILD.gn b/src/platform/android/BUILD.gn
@@ -105,5 +105,5 @@ android_library("java") {
 }
 
 java_prebuilt("android_sdk") {
-  jar_path = "${android_sdk_root}/platforms/android-21/android.jar"
+  jar_path = "${android_sdk_root}/platforms/android-26/android.jar"
 }
diff --git a/src/setup_payload/java/BUILD.gn b/src/setup_payload/java/BUILD.gn
@@ -60,5 +60,5 @@ android_library("java") {
   ]
 
   # TODO: add classpath support (we likely need to add something like
-  #  ..../platforms/android-21/android.jar to access BLE items)
+  #  ..../platforms/android-26/android.jar to access BLE items)
 }

Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,5 @@ declare_args() {`
`20`	`20`	`android_ndk_root = ""`
`21`	`21`
`22`	`22`	`# Version of the Android SDK.`
`23`		`- android_sdk_version = 21`
	`23`	`+ android_sdk_version = 26`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -151,11 +151,11 @@ android_library("java") {`
`151`	`151`	`javac_flags = [ "-Xlint:deprecation" ]`
`152`	`152`
`153`	`153`	`# TODO: add classpath support (we likely need to add something like`
`154`		`- # ..../platforms/android-21/android.jar to access BLE items)`
	`154`	`+ # ..../platforms/android-26/android.jar to access BLE items)`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`java_prebuilt("android") {`
`158`		`- jar_path = "${android_sdk_root}/platforms/android-21/android.jar"`
	`158`	`+ jar_path = "${android_sdk_root}/platforms/android-26/android.jar"`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`group("default") {`
Original file line number	Diff line number	Diff line change
`@@ -86,11 +86,11 @@ android_library("java") {`
`86`	`86`	`javac_flags = [ "-Xlint:deprecation" ]`
`87`	`87`
`88`	`88`	`# TODO: add classpath support (we likely need to add something like`
`89`		`- # ..../platforms/android-21/android.jar to access BLE items)`
	`89`	`+ # ..../platforms/android-26/android.jar to access BLE items)`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`java_prebuilt("android") {`
`93`		`- jar_path = "${android_sdk_root}/platforms/android-21/android.jar"`
	`93`	`+ jar_path = "${android_sdk_root}/platforms/android-26/android.jar"`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`group("default") {`
Original file line number	Diff line number	Diff line change
`@@ -70,9 +70,9 @@ android_library("java") {`
`70`	`70`	`javac_flags = [ "-Xlint:deprecation" ]`
`71`	`71`
`72`	`72`	`# TODO: add classpath support (we likely need to add something like`
`73`		`- # ..../platforms/android-21/android.jar to access BLE items)`
	`73`	`+ # ..../platforms/android-26/android.jar to access BLE items)`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`java_prebuilt("android") {`
`77`		`- jar_path = "${android_sdk_root}/platforms/android-21/android.jar"`
	`77`	`+ jar_path = "${android_sdk_root}/platforms/android-26/android.jar"`
`78`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ android_library("java") {`
`286`	`286`	`]`
`287`	`287`
`288`	`288`	`# TODO: add classpath support (we likely need to add something like`
`289`		`- # ..../platforms/android-21/android.jar to access BLE items)`
	`289`	`+ # ..../platforms/android-26/android.jar to access BLE items)`
`290`	`290`	`}`
`291`	`291`
`292`	`292`	`if (chip_link_tests) {`
`@@ -318,7 +318,7 @@ if (chip_link_tests) {`
`318`	`318`	`javac_flags = [ "-Xlint:deprecation" ]`
`319`	`319`
`320`	`320`	`# TODO: add classpath support (we likely need to add something like`
`321`		`- # ..../platforms/android-21/android.jar to access BLE items)`
	`321`	`+ # ..../platforms/android-26/android.jar to access BLE items)`
`322`	`322`	`}`
`323`	`323`
`324`	`324`	`android_library("tests") {`
`@@ -353,12 +353,12 @@ if (chip_link_tests) {`
`353`	`353`	`javac_flags = [ "-Xlint:deprecation" ]`
`354`	`354`
`355`	`355`	`# TODO: add classpath support (we likely need to add something like`
`356`		`- # ..../platforms/android-21/android.jar to access BLE items)`
	`356`	`+ # ..../platforms/android-26/android.jar to access BLE items)`
`357`	`357`	`}`
`358`	`358`	`}`
`359`	`359`
`360`	`360`	`if (!build_java_matter_controller) {`
`361`	`361`	`java_prebuilt("android") {`
`362`		`- jar_path = "${android_sdk_root}/platforms/android-21/android.jar"`
	`362`	`+ jar_path = "${android_sdk_root}/platforms/android-26/android.jar"`
`363`	`363`	`}`
`364`	`364`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,11 +70,11 @@ android_library("java") {`
`70`	`70`	`javac_flags = [ "-Xlint:deprecation" ]`
`71`	`71`
`72`	`72`	`# TODO: add classpath support (we likely need to add something like`
`73`		`- # ..../platforms/android-21/android.jar to access BLE items)`
	`73`	`+ # ..../platforms/android-26/android.jar to access BLE items)`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`if (!build_java_matter_controller) {`
`77`	`77`	`java_prebuilt("android") {`
`78`		`- jar_path = "${android_sdk_root}/platforms/android-21/android.jar"`
	`78`	`+ jar_path = "${android_sdk_root}/platforms/android-26/android.jar"`
`79`	`79`	`}`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,5 +105,5 @@ android_library("java") {`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`java_prebuilt("android_sdk") {`
`108`		`- jar_path = "${android_sdk_root}/platforms/android-21/android.jar"`
	`108`	`+ jar_path = "${android_sdk_root}/platforms/android-26/android.jar"`
`109`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,5 +60,5 @@ android_library("java") {`
`60`	`60`	`]`
`61`	`61`
`62`	`62`	`# TODO: add classpath support (we likely need to add something like`
`63`		`- # ..../platforms/android-21/android.jar to access BLE items)`
	`63`	`+ # ..../platforms/android-26/android.jar to access BLE items)`
`64`	`64`	`}`