Clean up API level in test_config.py.

The API level was being passed as the string "android-$API_LEVEL",
which meant you had to perform some pre-processing before using it.

Pass it in as an integer instead. To avoid accidentally comparing it
with `None` (integer comparisons with `None` are generally not a good
idea in python2, and invalid in python3), stop allowing `None` for
this value. Check Application.mk for a default, or fallback to the
default level for the ABI.

Change-Id: Ib97f544d0e4b4d4d0798b5d82e749fc8caaa8a9f

1 files changed, 11 insertions, 0 deletions

diff --git a/build/lib/build_support.py b/build/lib/build_support.py
index d81efa291..d43cb88ac 100644
--- a/build/lib/build_support.py
+++ b/build/lib/build_support.py
@@ -70,6 +70,17 @@ ALL_ABIS = (
 )
 
 
+LP32_ABIS = ('armeabi', 'armeabi-v7a', 'mips', 'x86')
+LP64_ABIS = ('arm64-v8a', 'mips64', 'x86_64')
+
+
+def minimum_platform_level(abi):
+    if abi in LP64_ABIS:
+        return 21
+    else:
+        return 9
+
+
 class Timer(object):
     def __init__(self):
         self.start_time = None