From fd9b4ccdd1b9815e0eae16b4d44bce51f7343aef Mon Sep 17 00:00:00 2001 From: Jesse Hall Date: Fri, 4 Aug 2017 14:54:25 -0700 Subject: [PATCH] Add Android target API option Components: Framework Change-Id: I9c86d2fac0dcf9067db9276a2096d849ea2775de --- scripts/android/build_apk.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/scripts/android/build_apk.py b/scripts/android/build_apk.py index 11e50e8..2f86bd8 100644 --- a/scripts/android/build_apk.py +++ b/scripts/android/build_apk.py @@ -168,12 +168,12 @@ class Environment: self.ndk = ndk class Configuration: - def __init__(self, env, buildPath, abis, nativeBuildType, gtfTarget, verbose): + def __init__(self, env, buildPath, abis, nativeApi, nativeBuildType, gtfTarget, verbose): self.env = env self.sourcePath = DEQP_DIR self.buildPath = buildPath self.abis = abis - self.nativeApi = 21 + self.nativeApi = nativeApi self.javaApi = 22 self.nativeBuildType = nativeBuildType self.gtfTarget = gtfTarget @@ -856,6 +856,11 @@ def parseArgs (): dest='abis', default=",".join(NDKEnv.getKnownAbis()), help="ABIs to build") + parser.add_argument('--native-api', + type=int, + dest='nativeApi', + default=21, + help="Android API level to target in native code") parser.add_argument('--sdk', dest='sdkPath', default=defaultSDKPath, @@ -915,7 +920,7 @@ if __name__ == "__main__": sdk = SDKEnv(os.path.realpath(args.sdkPath)) buildPath = os.path.realpath(args.buildRoot) env = Environment(sdk, ndk) - config = Configuration(env, buildPath, abis=args.abis, nativeBuildType=args.nativeBuildType, gtfTarget=args.gtfTarget, verbose=args.verbose) + config = Configuration(env, buildPath, abis=args.abis, nativeApi=args.nativeApi, nativeBuildType=args.nativeBuildType, gtfTarget=args.gtfTarget, verbose=args.verbose) try: config.check() -- 2.7.4