From d00fc08cf78849145dfb1cb371ea271e831bdb07 Mon Sep 17 00:00:00 2001
From: Xavier Ducrohet <xav@android.com>
Date: Thu, 11 Mar 2010 18:48:56 -0800
Subject: Disable writting the apk settings.

This is not fully supported. Its presence in
default.properties can be confusing the devs
in thinking this is supported.

Also removed a useless helper class.

Change-Id: Ia26b31e258f53964a437c7bbe202da857796df8e
---
 anttasks/src/com/android/ant/AaptExecLoopTask.java | 3 +--
 anttasks/src/com/android/ant/ApkBuilderTask.java   | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'anttasks/src/com/android')

diff --git a/anttasks/src/com/android/ant/AaptExecLoopTask.java b/anttasks/src/com/android/ant/AaptExecLoopTask.java
index afe4d35..9fe2170 100644
--- a/anttasks/src/com/android/ant/AaptExecLoopTask.java
+++ b/anttasks/src/com/android/ant/AaptExecLoopTask.java
@@ -16,7 +16,6 @@
 
 package com.android.ant;
 
-import com.android.sdklib.internal.project.ApkConfigurationHelper;
 import com.android.sdklib.internal.project.ApkSettings;
 import com.android.sdklib.internal.project.ProjectProperties;
 import com.android.sdklib.internal.project.ProjectProperties.PropertyType;
@@ -267,7 +266,7 @@ public final class AaptExecLoopTask extends Task {
                 PropertyType.DEFAULT);
 
 
-        ApkSettings apkSettings = ApkConfigurationHelper.getSettings(properties);
+        ApkSettings apkSettings = new ApkSettings(properties);
         if (apkSettings != null) {
             Map<String, String> apkFilters = apkSettings.getResourceFilters();
             if (apkFilters.size() > 0) {
diff --git a/anttasks/src/com/android/ant/ApkBuilderTask.java b/anttasks/src/com/android/ant/ApkBuilderTask.java
index c326fa9..3fdf4d5 100644
--- a/anttasks/src/com/android/ant/ApkBuilderTask.java
+++ b/anttasks/src/com/android/ant/ApkBuilderTask.java
@@ -19,7 +19,6 @@ package com.android.ant;
 import com.android.apkbuilder.ApkBuilder.ApkCreationException;
 import com.android.apkbuilder.internal.ApkBuilderImpl;
 import com.android.apkbuilder.internal.ApkBuilderImpl.ApkFile;
-import com.android.sdklib.internal.project.ApkConfigurationHelper;
 import com.android.sdklib.internal.project.ApkSettings;
 import com.android.sdklib.internal.project.ProjectProperties;
 import com.android.sdklib.internal.project.ProjectProperties.PropertyType;
@@ -245,7 +244,7 @@ public class ApkBuilderTask extends Task {
             ProjectProperties properties = ProjectProperties.load(baseDir.getAbsolutePath(),
                     PropertyType.DEFAULT);
 
-            ApkSettings apkSettings = ApkConfigurationHelper.getSettings(properties);
+            ApkSettings apkSettings = new ApkSettings(properties);
             if (apkSettings != null) {
                 Map<String, String> apkFilters = apkSettings.getResourceFilters();
                 if (apkFilters.size() > 0) {
-- 
cgit v1.1