Merge "Fix import of FullRevision."
diff --git a/builder/src/main/java/com/android/builder/AndroidBuilder.java b/builder/src/main/java/com/android/builder/AndroidBuilder.java
index 6bfaee7..f4ff2d2 100644
--- a/builder/src/main/java/com/android/builder/AndroidBuilder.java
+++ b/builder/src/main/java/com/android/builder/AndroidBuilder.java
@@ -44,7 +44,7 @@
import com.android.manifmerger.MergerLog;
import com.android.sdklib.IAndroidTarget;
import com.android.sdklib.IAndroidTarget.IOptionalLibrary;
-import com.android.sdklib.internal.repository.packages.FullRevision;
+import com.android.sdklib.repository.FullRevision;
import com.android.utils.ILogger;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Lists;
@@ -202,10 +202,10 @@
/**
* Returns an {@link AaptRunner} able to run aapt commands.
- * @return
+ * @return an AaptRunner object
*/
public AaptRunner getAaptRunner() {
- return new AaptRunner(mTarget.getPath(IAndroidTarget.AAPT), mCmdLineRunner);
+ return new AaptRunner(mSdkParser.getAapt().getAbsolutePath(), mCmdLineRunner);
}
/**
diff --git a/builder/src/main/java/com/android/builder/DefaultSdkParser.java b/builder/src/main/java/com/android/builder/DefaultSdkParser.java
index 91dfa36..9cc48b2 100644
--- a/builder/src/main/java/com/android/builder/DefaultSdkParser.java
+++ b/builder/src/main/java/com/android/builder/DefaultSdkParser.java
@@ -20,7 +20,7 @@
import com.android.annotations.NonNull;
import com.android.sdklib.IAndroidTarget;
import com.android.sdklib.SdkManager;
-import com.android.sdklib.internal.repository.packages.FullRevision;
+import com.android.sdklib.repository.FullRevision;
import com.android.sdklib.repository.PkgProps;
import com.android.utils.ILogger;
import com.google.common.base.Charsets;
diff --git a/builder/src/main/java/com/android/builder/PlatformSdkParser.java b/builder/src/main/java/com/android/builder/PlatformSdkParser.java
index 9fbb36f..5cfb1f4 100644
--- a/builder/src/main/java/com/android/builder/PlatformSdkParser.java
+++ b/builder/src/main/java/com/android/builder/PlatformSdkParser.java
@@ -20,7 +20,7 @@
import com.android.annotations.NonNull;
import com.android.builder.internal.FakeAndroidTarget;
import com.android.sdklib.IAndroidTarget;
-import com.android.sdklib.internal.repository.packages.FullRevision;
+import com.android.sdklib.repository.FullRevision;
import com.android.utils.ILogger;
import com.google.common.collect.Maps;
@@ -30,7 +30,7 @@
/**
* Implementation of {@link SdkParser} for the SDK prebuilds in the Android source tree.
*/
-class PlatformSdkParser implements SdkParser {
+public class PlatformSdkParser implements SdkParser {
private final String mPlatformRootFolder;
private File mHostTools;
diff --git a/builder/src/main/java/com/android/builder/SdkParser.java b/builder/src/main/java/com/android/builder/SdkParser.java
index 0d269ff..efabc48 100644
--- a/builder/src/main/java/com/android/builder/SdkParser.java
+++ b/builder/src/main/java/com/android/builder/SdkParser.java
@@ -18,7 +18,7 @@
import com.android.annotations.NonNull;
import com.android.sdklib.IAndroidTarget;
-import com.android.sdklib.internal.repository.packages.FullRevision;
+import com.android.sdklib.repository.FullRevision;
import com.android.utils.ILogger;
import java.io.File;
diff --git a/builder/src/main/java/com/android/builder/internal/FakeAndroidTarget.java b/builder/src/main/java/com/android/builder/internal/FakeAndroidTarget.java
index 24e76d8..079479e 100644
--- a/builder/src/main/java/com/android/builder/internal/FakeAndroidTarget.java
+++ b/builder/src/main/java/com/android/builder/internal/FakeAndroidTarget.java
@@ -32,6 +32,7 @@
private final SparseArray<String> mPaths = new SparseArray<String>();
private final int mApiLevel;
+ @SuppressWarnings("deprecation")
public FakeAndroidTarget(String sdkLocation, String target) {
mSdkLocation = sdkLocation;
mApiLevel = getApiLevel(target);