commit 03fa11656fc2e27ba062a0709fbc7d0cd0b279b5
author Søren Gjesse <sgjesse@google.com> Mon Mar 10 12:03:05 2025 +0100
committer Søren Gjesse <sgjesse@google.com> Wed Mar 12 00:35:36 2025 -0700
tree 9775cc3c9c8bfc9c8f135e5f2e36b6da00771b0f
parent e10d2149da855b9393be2287c539b5361ebbe16d

Prepare scripts for major/minor API levels

For third_party/android_jar keep the current name scheme for
minor version 0, e.g.:

  third_party/android_jar/lib-v36

For other minor versions add the minor version, e.g.:

  third_party/android_jar/lib-v36.1

Change-Id: Ib06e0d7d551049ae10bc229a01c2cfbe62ff582e

tools/build_sample_apk.py

diff --git a/tools/build_sample_apk.py b/tools/build_sample_apk.py
index 0d577d4..e6adfcf 100755
--- a/tools/build_sample_apk.py
+++ b/tools/build_sample_apk.py
@@ -134,7 +134,7 @@
     with utils.ChangedWorkingDirectory(get_sample_dir(app)):
         args = [
             'package', '-v', '-f', '-I',
-            utils.get_android_jar(api), '-M', 'AndroidManifest.xml', '-A',
+            utils.get_android_jar(api, 0), '-M', 'AndroidManifest.xml', '-A',
             'assets', '-S', 'res', '-m', '-J',
             get_gen_path(app), '-F',
             os.path.join(get_bin_path(app), 'resources.ap_'), '-G',
@@ -147,7 +147,7 @@
     with utils.ChangedWorkingDirectory(get_sample_dir(app)):
         args = [
             'package', '-v', '-f', '-I',
-            utils.get_android_jar(api), '-M',
+            utils.get_android_jar(api, 0), '-M',
             'split_manifest/AndroidManifest.xml', '-S', 'res', '-F',
             os.path.join(get_bin_path(app), 'split_resources.ap_')
         ]
@@ -157,7 +157,7 @@
 def compile_with_javac(api, app):
     with utils.ChangedWorkingDirectory(get_sample_dir(app)):
         files = glob.glob(SRC_LOCATION.format(app=app))
-        classpath = '%s:%s' % (utils.get_android_jar(api), get_guava_jar())
+        classpath = '%s:%s' % (utils.get_android_jar(api, 0), get_guava_jar())
         command = [
             DEFAULT_JAVAC, '-classpath', classpath, '-sourcepath',
             '%s:%s:%s' %
@@ -177,7 +177,7 @@
     command = [
         DEFAULT_D8, '--', '--output',
         get_bin_path(app), '--classpath',
-        utils.get_android_jar(api), '--min-api',
+        utils.get_android_jar(api, 0), '--min-api',
         str(api)
     ]
     command.extend(files)