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
diff --git a/tools/utils.py b/tools/utils.py
index 0354cd9..4e6044a 100644
--- a/tools/utils.py
+++ b/tools/utils.py
@@ -724,13 +724,22 @@
if m is not None:
raise Exception("Do not use google JVM for benchmarking: " + version)
+def api_str(api_level_major, api_level_minor):
+ api = str(api_level_major)
+ if api_level_minor > 0:
+ api = api + '.' + str(api_level_minor)
+ return api
-def get_android_jar_dir(api):
- return os.path.join(REPO_ROOT, ANDROID_JAR_DIR.format(api=api))
+def get_android_jar_dir(api_level_major, api_level_minor):
+ return os.path.join(
+ REPO_ROOT,
+ ANDROID_JAR_DIR.format(api=api_str(api_level_major, api_level_minor)))
-def get_android_jar(api):
- return os.path.join(REPO_ROOT, ANDROID_JAR.format(api=api))
+def get_android_jar(api_level_major, api_level_minor):
+ return os.path.join(
+ REPO_ROOT,
+ ANDROID_JAR.format(api=api_str(api_level_major, api_level_minor)))
def is_bot():
