diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-05-09 11:20:20 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-05-10 16:29:32 +0000 |
| commit | 00ddad87b9425e61965586eadf30dc040003722a (patch) | |
| tree | 7f9dc0a08771b491e0a48cffbc450134ecba7c54 | |
| parent | 6f8354fe9c3494790d7dc27f012da5504fb19ae3 (diff) | |
Fix Android builds with newer SDKs
sdklib.jar was renamed to sdklib-VERSION.jar, and ApkBuilderMain now
depends on other JAR files in that directory as well. To simplify, add
the entire directory to the classpath, which should be both forwards and
backwards compatible.
Change-Id: I5ef9ae684dfd57c074a8db4e96d0590a95c7ab94
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | share/qbs/modules/Android/sdk/sdk.qbs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/share/qbs/modules/Android/sdk/sdk.qbs b/share/qbs/modules/Android/sdk/sdk.qbs index d7c373706..d07c2778f 100644 --- a/share/qbs/modules/Android/sdk/sdk.qbs +++ b/share/qbs/modules/Android/sdk/sdk.qbs @@ -273,7 +273,7 @@ Module { } prepare: { var args = ["-classpath", FileInfo.joinPaths(ModUtils.moduleProperty(product, "sdkDir"), - "tools/lib/sdklib.jar"), + "tools/lib/*"), "com.android.sdklib.build.ApkBuilderMain", output.filePath, "-z", inputs["android.ap_"][0].filePath, "-f", inputs["android.dex"][0].filePath]; |