aboutsummaryrefslogtreecommitdiffstats
path: root/apkbuilder
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-09-10 15:53:38 -0400
committerPiotr Gurgul <pgurgul@google.com>2009-09-14 14:44:54 -0700
commitd1dfc9a741536af8fcd901d8b70d934aff05f0e5 (patch)
tree68e18222b4c3bda88c9c693d9fc956e9d5b4bb1e /apkbuilder
parente0c7960c38d4e72dcc4f98f24d089b9399ef6f25 (diff)
downloadsdk-d1dfc9a741536af8fcd901d8b70d934aff05f0e5.zip
sdk-d1dfc9a741536af8fcd901d8b70d934aff05f0e5.tar.gz
sdk-d1dfc9a741536af8fcd901d8b70d934aff05f0e5.tar.bz2
Add <jarfile> tag to ApkBuilder ant task
ApkBuilder ant task accepts now the new tag - <jarfile>, used for passing emma_device.jar to ApkBuilder. Change-Id: I1757d265609406bc06da370ab0204018a4c8fc4d
Diffstat (limited to 'apkbuilder')
-rw-r--r--apkbuilder/src/com/android/apkbuilder/internal/ApkBuilderImpl.java11
1 files changed, 7 insertions, 4 deletions
diff --git a/apkbuilder/src/com/android/apkbuilder/internal/ApkBuilderImpl.java b/apkbuilder/src/com/android/apkbuilder/internal/ApkBuilderImpl.java
index 780af75..6a8213e 100644
--- a/apkbuilder/src/com/android/apkbuilder/internal/ApkBuilderImpl.java
+++ b/apkbuilder/src/com/android/apkbuilder/internal/ApkBuilderImpl.java
@@ -249,15 +249,18 @@ public final class ApkBuilderImpl {
for (String file : files) {
String path = f.getAbsolutePath() + File.separator + file;
- FileInputStream input = new FileInputStream(path);
- resourcesJars.add(input);
+ processJarFile(parameter, resourcesJars);
}
} else {
- FileInputStream input = new FileInputStream(parameter);
- resourcesJars.add(input);
+ processJarFile(parameter, resourcesJars);
}
}
+ public static void processJarFile(String jarfilePath, Collection<FileInputStream> resourcesJars)
+ throws FileNotFoundException {
+ FileInputStream input = new FileInputStream(jarfilePath);
+ resourcesJars.add(input);
+ }
/**
* Processes a {@link File} that could be a {@link ApkFile}, or a folder containing