aboutsummaryrefslogtreecommitdiffstats
path: root/apkbuilder
diff options
context:
space:
mode:
Diffstat (limited to 'apkbuilder')
-rw-r--r--apkbuilder/.classpath2
-rw-r--r--apkbuilder/src/Android.mk2
-rw-r--r--apkbuilder/src/com/android/apkbuilder/internal/ApkBuilderImpl.java8
3 files changed, 6 insertions, 6 deletions
diff --git a/apkbuilder/.classpath b/apkbuilder/.classpath
index f1768fc50..63ec892f9 100644
--- a/apkbuilder/.classpath
+++ b/apkbuilder/.classpath
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src" path="/JarUtils"/>
<classpathentry combineaccessrules="false" kind="src" path="/AndroidPrefs"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/SdkLib"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/apkbuilder/src/Android.mk b/apkbuilder/src/Android.mk
index e403ca7ed..24ab27afc 100644
--- a/apkbuilder/src/Android.mk
+++ b/apkbuilder/src/Android.mk
@@ -21,7 +21,7 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_JAR_MANIFEST := ../etc/manifest.txt
LOCAL_JAVA_LIBRARIES := \
androidprefs \
- jarutils
+ sdklib
LOCAL_MODULE := apkbuilder
diff --git a/apkbuilder/src/com/android/apkbuilder/internal/ApkBuilderImpl.java b/apkbuilder/src/com/android/apkbuilder/internal/ApkBuilderImpl.java
index 2bc762597..781bc5a10 100644
--- a/apkbuilder/src/com/android/apkbuilder/internal/ApkBuilderImpl.java
+++ b/apkbuilder/src/com/android/apkbuilder/internal/ApkBuilderImpl.java
@@ -18,11 +18,11 @@ package com.android.apkbuilder.internal;
import com.android.apkbuilder.ApkBuilder.WrongOptionException;
import com.android.apkbuilder.ApkBuilder.ApkCreationException;
-import com.android.jarutils.DebugKeyProvider;
-import com.android.jarutils.JavaResourceFilter;
-import com.android.jarutils.SignedJarBuilder;
-import com.android.jarutils.DebugKeyProvider.KeytoolException;
import com.android.prefs.AndroidLocation.AndroidLocationException;
+import com.android.sdklib.internal.build.DebugKeyProvider;
+import com.android.sdklib.internal.build.JavaResourceFilter;
+import com.android.sdklib.internal.build.SignedJarBuilder;
+import com.android.sdklib.internal.build.DebugKeyProvider.KeytoolException;
import java.io.File;
import java.io.FileInputStream;