Proguard support.

Change-Id: I236458b4ae883481ff3afa9123f0167dbd270ac1

47 files changed, 390 insertions, 10 deletions

diff --git a/tests/aidl/build.gradle b/tests/aidl/build.gradle
index 056d567..9b46579 100644
--- a/tests/aidl/build.gradle
+++ b/tests/aidl/build.gradle
@@ -2,6 +2,7 @@ buildscript {
     repositories {
         maven { url '../../repo' }
         maven { url '../../../../prebuilts/tools/common/m2/repository' }
+        maven { url '../../../../prebuilts/tools/common/m2/internal' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/api/build.gradle b/tests/api/build.gradle
index b56cb14..7981280 100644
--- a/tests/api/build.gradle
+++ b/tests/api/build.gradle
@@ -2,6 +2,7 @@ buildscript {
     repositories {
         maven { url '../../repo' }
         maven { url '../../../../prebuilts/tools/common/m2/repository' }
+        maven { url '../../../../prebuilts/tools/common/m2/internal' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/applibtest/build.gradle b/tests/applibtest/build.gradle
index b56cb14..7981280 100644
--- a/tests/applibtest/build.gradle
+++ b/tests/applibtest/build.gradle
@@ -2,6 +2,7 @@ buildscript {
     repositories {
         maven { url '../../repo' }
         maven { url '../../../../prebuilts/tools/common/m2/repository' }
+        maven { url '../../../../prebuilts/tools/common/m2/internal' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/assets/build.gradle b/tests/assets/build.gradle
index aa283a0..2fe645b 100644
--- a/tests/assets/build.gradle
+++ b/tests/assets/build.gradle
@@ -2,6 +2,7 @@ buildscript {
     repositories {
         maven { url '../../repo' }
         maven { url '../../../../prebuilts/tools/common/m2/repository' }
+        maven { url '../../../../prebuilts/tools/common/m2/internal' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/attrOrder/build.gradle b/tests/attrOrder/build.gradle
index b56cb14..7981280 100644
--- a/tests/attrOrder/build.gradle
+++ b/tests/attrOrder/build.gradle
@@ -2,6 +2,7 @@ buildscript {
     repositories {
         maven { url '../../repo' }
         maven { url '../../../../prebuilts/tools/common/m2/repository' }
+        maven { url '../../../../prebuilts/tools/common/m2/internal' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/basic/build.gradle b/tests/basic/build.gradle
index 7a415a7..1ad3105 100644
--- a/tests/basic/build.gradle
+++ b/tests/basic/build.gradle
@@ -1,10 +1,8 @@
-//
-// A basic Android application that follows all the conventions
-//
 buildscript {
     repositories {
         maven { url '../../repo' }
         maven { url '../../../../prebuilts/tools/common/m2/repository' }
+        maven { url '../../../../prebuilts/tools/common/m2/internal' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/dependencies/build.gradle b/tests/dependencies/build.gradle
index d832af5..775f904 100644
--- a/tests/dependencies/build.gradle
+++ b/tests/dependencies/build.gradle
@@ -1,10 +1,8 @@
-//
-// A basic Android application that follows all the conventions
-//
 buildscript {
     repositories {
         maven { url '../../repo' }
         maven { url '../../../../prebuilts/tools/common/m2/repository' }
+        maven { url '../../../../prebuilts/tools/common/m2/internal' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/flavored/build.gradle b/tests/flavored/build.gradle
index a5455fd..3785785 100644
--- a/tests/flavored/build.gradle
+++ b/tests/flavored/build.gradle
@@ -1,10 +1,8 @@
-//
-// A basic Android application that follows all the conventions
-//
 buildscript {
     repositories {
         maven { url '../../repo' }
         maven { url '../../../../prebuilts/tools/common/m2/repository' }
+        maven { url '../../../../prebuilts/tools/common/m2/internal' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/flavorlib/build.gradle b/tests/flavorlib/build.gradle
index aa283a0..2fe645b 100644
--- a/tests/flavorlib/build.gradle
+++ b/tests/flavorlib/build.gradle
@@ -2,6 +2,7 @@ buildscript {
     repositories {
         maven { url '../../repo' }
         maven { url '../../../../prebuilts/tools/common/m2/repository' }
+        maven { url '../../../../prebuilts/tools/common/m2/internal' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/flavorlibWithFailedTests/build.gradle b/tests/flavorlibWithFailedTests/build.gradle
index aa283a0..2fe645b 100644
--- a/tests/flavorlibWithFailedTests/build.gradle
+++ b/tests/flavorlibWithFailedTests/build.gradle
@@ -2,6 +2,7 @@ buildscript {
     repositories {
         maven { url '../../repo' }
         maven { url '../../../../prebuilts/tools/common/m2/repository' }
+        maven { url '../../../../prebuilts/tools/common/m2/internal' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/flavors/build.gradle b/tests/flavors/build.gradle
index 7d1fc45..3593d04 100644
--- a/tests/flavors/build.gradle
+++ b/tests/flavors/build.gradle
@@ -2,6 +2,7 @@ buildscript {
     repositories {
         maven { url '../../repo' }
         maven { url '../../../../prebuilts/tools/common/m2/repository' }
+        maven { url '../../../../prebuilts/tools/common/m2/internal' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/libsTest/build.gradle b/tests/libsTest/build.gradle
index aa283a0..2fe645b 100644
--- a/tests/libsTest/build.gradle
+++ b/tests/libsTest/build.gradle
@@ -2,6 +2,7 @@ buildscript {
     repositories {
         maven { url '../../repo' }
         maven { url '../../../../prebuilts/tools/common/m2/repository' }
+        maven { url '../../../../prebuilts/tools/common/m2/internal' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/localJars/build.gradle b/tests/localJars/build.gradle
index cd7e13d..573f6dc 100644
--- a/tests/localJars/build.gradle
+++ b/tests/localJars/build.gradle
@@ -2,6 +2,7 @@ buildscript {
     repositories {
         maven { url '../../repo' }
         maven { url '../../../../prebuilts/tools/common/m2/repository' }
+        maven { url '../../../../prebuilts/tools/common/m2/internal' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/migrated/build.gradle b/tests/migrated/build.gradle
index d73ea88..3a09dd6 100644
--- a/tests/migrated/build.gradle
+++ b/tests/migrated/build.gradle
@@ -2,7 +2,7 @@ buildscript {
     repositories {
         maven { url '../../repo' }
         maven { url '../../../../prebuilts/tools/common/m2/repository' }
-
+        maven { url '../../../../prebuilts/tools/common/m2/internal' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/multiproject/build.gradle b/tests/multiproject/build.gradle
index cd7e13d..573f6dc 100644
--- a/tests/multiproject/build.gradle
+++ b/tests/multiproject/build.gradle
@@ -2,6 +2,7 @@ buildscript {
     repositories {
         maven { url '../../repo' }
         maven { url '../../../../prebuilts/tools/common/m2/repository' }
+        maven { url '../../../../prebuilts/tools/common/m2/internal' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/multires/build.gradle b/tests/multires/build.gradle
index 31134b9..ce3dfd8 100644
--- a/tests/multires/build.gradle
+++ b/tests/multires/build.gradle
@@ -2,6 +2,7 @@ buildscript {
     repositories {
         maven { url '../../repo' }
         maven { url '../../../../prebuilts/tools/common/m2/repository' }
+        maven { url '../../../../prebuilts/tools/common/m2/internal' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/overlay1/build.gradle b/tests/overlay1/build.gradle
index 9dfca6b..25a15a2 100644
--- a/tests/overlay1/build.gradle
+++ b/tests/overlay1/build.gradle
@@ -2,6 +2,7 @@ buildscript {
     repositories {
         maven { url '../../repo' }
         maven { url '../../../../prebuilts/tools/common/m2/repository' }
+        maven { url '../../../../prebuilts/tools/common/m2/internal' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/overlay2/build.gradle b/tests/overlay2/build.gradle
index d47963f..811230e 100644
--- a/tests/overlay2/build.gradle
+++ b/tests/overlay2/build.gradle
@@ -2,6 +2,7 @@ buildscript {
     repositories {
         maven { url '../../repo' }
         maven { url '../../../../prebuilts/tools/common/m2/repository' }
+        maven { url '../../../../prebuilts/tools/common/m2/internal' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/pkgOverride/build.gradle b/tests/pkgOverride/build.gradle
index 1594805..628f6f5 100644
--- a/tests/pkgOverride/build.gradle
+++ b/tests/pkgOverride/build.gradle
@@ -2,6 +2,7 @@ buildscript {
     repositories {
         maven { url '../../repo' }
         maven { url '../../../../prebuilts/tools/common/m2/repository' }
+        maven { url '../../../../prebuilts/tools/common/m2/internal' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/proguard/build.gradle b/tests/proguard/build.gradle
new file mode 100644
index 0000000..07fb58e
--- /dev/null
+++ b/tests/proguard/build.gradle
@@ -0,0 +1,37 @@
+buildscript {
+    repositories {
+        maven { url '../../repo' }
+        maven { url '../../../../prebuilts/tools/common/m2/repository' }
+        maven { url '../../../../prebuilts/tools/common/m2/internal' }
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
+    }
+}
+apply plugin: 'android'
+
+android {
+    compileSdkVersion 15
+    buildToolsVersion "17.0"
+
+    testBuildType "proguard"
+
+    defaultConfig {
+        versionCode 12
+        versionName "2.0"
+        minSdkVersion 16
+        targetSdkVersion 16
+    }
+
+    buildTypes {
+        proguard.initWith(buildTypes.debug)
+        proguard {
+            runProguard true
+            proguardFile getDefaultProguardFile('proguard-android.txt')
+        }
+    }
+
+    dexOptions {
+        incremental false
+    }
+}
\ No newline at end of file
diff --git a/tests/proguard/src/instrumentTest/java/com/android/tests/basic/MainTest.java b/tests/proguard/src/instrumentTest/java/com/android/tests/basic/MainTest.java
new file mode 100644
index 0000000..cbbc52b
--- /dev/null
+++ b/tests/proguard/src/instrumentTest/java/com/android/tests/basic/MainTest.java
@@ -0,0 +1,42 @@
+package com.android.tests.basic;
+
+import android.test.ActivityInstrumentationTestCase2;
+import android.test.suitebuilder.annotation.MediumTest;
+import android.widget.TextView;
+
+public class MainTest extends ActivityInstrumentationTestCase2<Main> {
+
+    private TextView mTextView;
+
+    /**
+     * Creates an {@link ActivityInstrumentationTestCase2} that tests the {@link Main} activity.
+     */
+    public MainTest() {
+        super(Main.class);
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        final Main a = getActivity();
+        // ensure a valid handle to the activity has been returned
+        assertNotNull(a);
+        mTextView = (TextView) a.findViewById(R.id.dateText);
+    }
+
+    /**
+     * The name 'test preconditions' is a convention to signal that if this
+     * test doesn't pass, the test case was not set up properly and it might
+     * explain any and all failures in other tests.  This is not guaranteed
+     * to run before other tests, as junit uses reflection to find the tests.
+     */
+    @MediumTest
+    public void testPreconditions() {
+        assertNotNull(mTextView);
+    }
+
+    public void testTextViewContent() {
+        assertEquals("1234", mTextView.getText());
+    }
+}
+
diff --git a/tests/proguard/src/main/AndroidManifest.xml b/tests/proguard/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..4f8d570
--- /dev/null
+++ b/tests/proguard/src/main/AndroidManifest.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="com.android.tests.basic">
+    <application android:label="@string/app_name" android:icon="@drawable/icon">
+        <activity android:name=".Main"
+                  android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+    <uses-permission android:name="com.blah" />
+
+    <permission-group android:name="foo.permission-group.COST_MONEY"
+        android:label="@string/app_name"
+        android:description="@string/app_name" />
+
+    <permission android:name="foo.permission.SEND_SMS"
+        android:permissionGroup="foo.permission-group.COST_MONEY"
+        android:label="@string/app_name"
+        android:description="@string/app_name" />
+
+    <permission android:name="foo.blah.SEND_SMS"
+        android:permissionGroup="foo.permission-group.COST_MONEY"
+        android:label="@string/app_name"
+        android:description="@string/app_name" />
+
+</manifest>
diff --git a/tests/proguard/src/main/java/com/android/tests/basic/Main.java b/tests/proguard/src/main/java/com/android/tests/basic/Main.java
new file mode 100644
index 0000000..6d3ae10
--- /dev/null
+++ b/tests/proguard/src/main/java/com/android/tests/basic/Main.java
@@ -0,0 +1,23 @@
+package com.android.tests.basic;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.TextView;
+
+public class Main extends Activity
+{
+
+    private int foo = 1234;
+
+    /** Called when the activity is first created. */
+    @Override
+    public void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.main);
+
+        TextView tv = (TextView) findViewById(R.id.dateText);
+        StringProvider stringProvider = new StringProvider();
+        tv.setText(stringProvider.getString(foo));
+    }
+}
diff --git a/tests/proguard/src/main/java/com/android/tests/basic/StringProvider.java b/tests/proguard/src/main/java/com/android/tests/basic/StringProvider.java
new file mode 100644
index 0000000..6659418
--- /dev/null
+++ b/tests/proguard/src/main/java/com/android/tests/basic/StringProvider.java
@@ -0,0 +1,8 @@
+package com.android.tests.basic;
+
+public class StringProvider {
+
+    public String getString(int foo) {
+        return Integer.toString(foo);
+    }
+}
diff --git a/tests/proguard/src/main/res/drawable/icon.png b/tests/proguard/src/main/res/drawable/icon.png
new file mode 100644
index 0000000..a07c69f
--- /dev/null
+++ b/tests/proguard/src/main/res/drawable/icon.png
diff --git a/tests/proguard/src/main/res/layout/main.xml b/tests/proguard/src/main/res/layout/main.xml
new file mode 100644
index 0000000..89ab091
--- /dev/null
+++ b/tests/proguard/src/main/res/layout/main.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+<TextView
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:text="Test App - Basic"
+    android:id="@+id/text"
+    />
+<TextView
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:text=""
+    android:id="@+id/dateText"
+    />
+</LinearLayout>
+
diff --git a/tests/proguard/src/main/res/values/strings.xml b/tests/proguard/src/main/res/values/strings.xml
new file mode 100644
index 0000000..60ea2d0
--- /dev/null
+++ b/tests/proguard/src/main/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">_Test-Basic</string>
+</resources>
diff --git a/tests/proguardLib/app/build.gradle b/tests/proguardLib/app/build.gradle
new file mode 100644
index 0000000..6b35651
--- /dev/null
+++ b/tests/proguardLib/app/build.gradle
@@ -0,0 +1,31 @@
+apply plugin: 'android'
+
+dependencies {
+    compile project(':lib')
+}
+
+android {
+    compileSdkVersion 15
+    buildToolsVersion "17.0"
+
+    testBuildType "proguard"
+
+    defaultConfig {
+        versionCode 12
+        versionName "2.0"
+        minSdkVersion 16
+        targetSdkVersion 16
+    }
+
+    buildTypes {
+        proguard.initWith(buildTypes.debug)
+        proguard {
+            runProguard true
+            proguardFile getDefaultProguardFile('proguard-android.txt')
+        }
+    }
+
+    dexOptions {
+        incremental false
+    }
+}
\ No newline at end of file
diff --git a/tests/proguardLib/app/src/instrumentTest/java/com/android/tests/basic/MainTest.java b/tests/proguardLib/app/src/instrumentTest/java/com/android/tests/basic/MainTest.java
new file mode 100644
index 0000000..cbbc52b
--- /dev/null
+++ b/tests/proguardLib/app/src/instrumentTest/java/com/android/tests/basic/MainTest.java
@@ -0,0 +1,42 @@
+package com.android.tests.basic;
+
+import android.test.ActivityInstrumentationTestCase2;
+import android.test.suitebuilder.annotation.MediumTest;
+import android.widget.TextView;
+
+public class MainTest extends ActivityInstrumentationTestCase2<Main> {
+
+    private TextView mTextView;
+
+    /**
+     * Creates an {@link ActivityInstrumentationTestCase2} that tests the {@link Main} activity.
+     */
+    public MainTest() {
+        super(Main.class);
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        final Main a = getActivity();
+        // ensure a valid handle to the activity has been returned
+        assertNotNull(a);
+        mTextView = (TextView) a.findViewById(R.id.dateText);
+    }
+
+    /**
+     * The name 'test preconditions' is a convention to signal that if this
+     * test doesn't pass, the test case was not set up properly and it might
+     * explain any and all failures in other tests.  This is not guaranteed
+     * to run before other tests, as junit uses reflection to find the tests.
+     */
+    @MediumTest
+    public void testPreconditions() {
+        assertNotNull(mTextView);
+    }
+
+    public void testTextViewContent() {
+        assertEquals("1234", mTextView.getText());
+    }
+}
+
diff --git a/tests/proguardLib/app/src/main/AndroidManifest.xml b/tests/proguardLib/app/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..4f8d570
--- /dev/null
+++ b/tests/proguardLib/app/src/main/AndroidManifest.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="com.android.tests.basic">
+    <application android:label="@string/app_name" android:icon="@drawable/icon">
+        <activity android:name=".Main"
+                  android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+    <uses-permission android:name="com.blah" />
+
+    <permission-group android:name="foo.permission-group.COST_MONEY"
+        android:label="@string/app_name"
+        android:description="@string/app_name" />
+
+    <permission android:name="foo.permission.SEND_SMS"
+        android:permissionGroup="foo.permission-group.COST_MONEY"
+        android:label="@string/app_name"
+        android:description="@string/app_name" />
+
+    <permission android:name="foo.blah.SEND_SMS"
+        android:permissionGroup="foo.permission-group.COST_MONEY"
+        android:label="@string/app_name"
+        android:description="@string/app_name" />
+
+</manifest>
diff --git a/tests/proguardLib/app/src/main/java/com/android/tests/basic/Main.java b/tests/proguardLib/app/src/main/java/com/android/tests/basic/Main.java
new file mode 100644
index 0000000..77edc4c
--- /dev/null
+++ b/tests/proguardLib/app/src/main/java/com/android/tests/basic/Main.java
@@ -0,0 +1,31 @@
+package com.android.tests.basic;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.TextView;
+import java.lang.reflect.Method;
+
+public class Main extends Activity
+{
+
+    private int foo = 1234;
+
+    /** Called when the activity is first created. */
+    @Override
+    public void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.main);
+
+        TextView tv = (TextView) findViewById(R.id.dateText);
+
+        try {
+            // use reflection to make sure the class wasn't obfuscated
+            Class<?> theClass = Class.forName("com.android.tests.basic.StringProvider");
+            Method method = theClass.getDeclaredMethod("getString", int.class);
+            tv.setText((String) method.invoke(null, foo));
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/tests/proguardLib/app/src/main/res/drawable/icon.png b/tests/proguardLib/app/src/main/res/drawable/icon.png
new file mode 100644
index 0000000..a07c69f
--- /dev/null
+++ b/tests/proguardLib/app/src/main/res/drawable/icon.png
diff --git a/tests/proguardLib/app/src/main/res/layout/main.xml b/tests/proguardLib/app/src/main/res/layout/main.xml
new file mode 100644
index 0000000..89ab091
--- /dev/null
+++ b/tests/proguardLib/app/src/main/res/layout/main.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+<TextView
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:text="Test App - Basic"
+    android:id="@+id/text"
+    />
+<TextView
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:text=""
+    android:id="@+id/dateText"
+    />
+</LinearLayout>
+
diff --git a/tests/proguardLib/app/src/main/res/values/strings.xml b/tests/proguardLib/app/src/main/res/values/strings.xml
new file mode 100644
index 0000000..60ea2d0
--- /dev/null
+++ b/tests/proguardLib/app/src/main/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">_Test-Basic</string>
+</resources>
diff --git a/tests/proguardLib/build.gradle b/tests/proguardLib/build.gradle
new file mode 100644
index 0000000..7981280
--- /dev/null
+++ b/tests/proguardLib/build.gradle
@@ -0,0 +1,10 @@
+buildscript {
+    repositories {
+        maven { url '../../repo' }
+        maven { url '../../../../prebuilts/tools/common/m2/repository' }
+        maven { url '../../../../prebuilts/tools/common/m2/internal' }
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
+    }
+}
diff --git a/tests/proguardLib/lib/build.gradle b/tests/proguardLib/lib/build.gradle
new file mode 100644
index 0000000..49f4759
--- /dev/null
+++ b/tests/proguardLib/lib/build.gradle
@@ -0,0 +1,14 @@
+apply plugin: 'android-library'
+
+android {
+    compileSdkVersion 15
+    buildToolsVersion "17.0"
+
+    defaultConfig {
+        versionCode 12
+        versionName "2.0"
+        minSdkVersion 16
+        targetSdkVersion 16
+        proguardFile 'config.pro'
+    }
+}
\ No newline at end of file
diff --git a/tests/proguardLib/lib/config.pro b/tests/proguardLib/lib/config.pro
new file mode 100644
index 0000000..3416f5d
--- /dev/null
+++ b/tests/proguardLib/lib/config.pro
@@ -0,0 +1,4 @@
+-keep public class com.android.tests.basic.StringProvider {
+    public static java.lang.String getString(int);
+}
+
diff --git a/tests/proguardLib/lib/src/main/AndroidManifest.xml b/tests/proguardLib/lib/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..593a287
--- /dev/null
+++ b/tests/proguardLib/lib/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="com.android.tests.basic">
+</manifest>
diff --git a/tests/proguardLib/lib/src/main/java/com/android/tests/basic/StringProvider.java b/tests/proguardLib/lib/src/main/java/com/android/tests/basic/StringProvider.java
new file mode 100644
index 0000000..6d81901
--- /dev/null
+++ b/tests/proguardLib/lib/src/main/java/com/android/tests/basic/StringProvider.java
@@ -0,0 +1,8 @@
+package com.android.tests.basic;
+
+public class StringProvider {
+
+    public static String getString(int foo) {
+        return Integer.toString(foo);
+    }
+}
diff --git a/tests/proguardLib/settings.gradle b/tests/proguardLib/settings.gradle
new file mode 100644
index 0000000..eedb2a1
--- /dev/null
+++ b/tests/proguardLib/settings.gradle
@@ -0,0 +1,2 @@
+include 'app'
+include 'lib'
diff --git a/tests/renderscript/build.gradle b/tests/renderscript/build.gradle
index aea8a72..a0dd20b 100644
--- a/tests/renderscript/build.gradle
+++ b/tests/renderscript/build.gradle
@@ -2,6 +2,7 @@ buildscript {
     repositories {
         maven { url '../../repo' }
         maven { url '../../../../prebuilts/tools/common/m2/repository' }
+        maven { url '../../../../prebuilts/tools/common/m2/internal' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/renderscriptInLib/build.gradle b/tests/renderscriptInLib/build.gradle
index b56cb14..7981280 100644
--- a/tests/renderscriptInLib/build.gradle
+++ b/tests/renderscriptInLib/build.gradle
@@ -2,6 +2,7 @@ buildscript {
     repositories {
         maven { url '../../repo' }
         maven { url '../../../../prebuilts/tools/common/m2/repository' }
+        maven { url '../../../../prebuilts/tools/common/m2/internal' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/renderscriptMultiSrc/build.gradle b/tests/renderscriptMultiSrc/build.gradle
index f4b747b..0e0b05c 100644
--- a/tests/renderscriptMultiSrc/build.gradle
+++ b/tests/renderscriptMultiSrc/build.gradle
@@ -2,6 +2,7 @@ buildscript {
     repositories {
         maven { url '../../repo' }
         maven { url '../../../../prebuilts/tools/common/m2/repository' }
+        maven { url '../../../../prebuilts/tools/common/m2/internal' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/repo/app/build.gradle b/tests/repo/app/build.gradle
index f91e054..06f020e 100644
--- a/tests/repo/app/build.gradle
+++ b/tests/repo/app/build.gradle
@@ -2,6 +2,7 @@ buildscript {
     repositories {
         maven { url '../../../repo' }
         maven { url '../../../../../prebuilts/tools/common/m2/repository' }
+        maven { url '../../../../../prebuilts/tools/common/m2/internal' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/repo/baseLibrary/build.gradle b/tests/repo/baseLibrary/build.gradle
index 7e05eef..031edb6 100644
--- a/tests/repo/baseLibrary/build.gradle
+++ b/tests/repo/baseLibrary/build.gradle
@@ -2,6 +2,7 @@ buildscript {
     repositories {
         maven { url '../../../repo' }
         maven { url '../../../../../prebuilts/tools/common/m2/repository' }
+        maven { url '../../../../../prebuilts/tools/common/m2/internal' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/repo/library/build.gradle b/tests/repo/library/build.gradle
index 3ec3583..4aba1b1 100644
--- a/tests/repo/library/build.gradle
+++ b/tests/repo/library/build.gradle
@@ -2,6 +2,7 @@ buildscript {
     repositories {
         maven { url '../../../repo' }
         maven { url '../../../../../prebuilts/tools/common/m2/repository' }
+        maven { url '../../../../../prebuilts/tools/common/m2/internal' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
diff --git a/tests/tictactoe/build.gradle b/tests/tictactoe/build.gradle
index b56cb14..7981280 100644
--- a/tests/tictactoe/build.gradle
+++ b/tests/tictactoe/build.gradle
@@ -2,6 +2,7 @@ buildscript {
     repositories {
         maven { url '../../repo' }
         maven { url '../../../../prebuilts/tools/common/m2/repository' }
+        maven { url '../../../../prebuilts/tools/common/m2/internal' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'