Fix support for local jars in library projects.

Change-Id: If19406b935965bde63a761236366137f6fb5d73f

22 files changed, 201 insertions, 0 deletions

diff --git a/tests/localJars/app/build.gradle b/tests/localJars/app/build.gradle
new file mode 100644
index 0000000..75b4b6c
--- /dev/null
+++ b/tests/localJars/app/build.gradle
@@ -0,0 +1,14 @@
+//
+// A basic Android application split over a couple of Gradle projects.
+//
+
+apply plugin: 'android'
+
+android {
+    compileSdkVersion 15
+//    buildToolsVersion "1.0"
+}
+
+dependencies {
+    compile project(':library')
+}
diff --git a/tests/localJars/app/src/main/AndroidManifest.xml b/tests/localJars/app/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..71e7a47
--- /dev/null
+++ b/tests/localJars/app/src/main/AndroidManifest.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="com.example.android.multiproject"
+      android:versionCode="1"
+      android:versionName="1.0">
+    <application android:label="@string/app_name" android:icon="@drawable/ic_launcher">
+        <activity android:name="MainActivity"
+                  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>
+</manifest>
diff --git a/tests/localJars/app/src/main/java/com/example/android/multiproject/MainActivity.java b/tests/localJars/app/src/main/java/com/example/android/multiproject/MainActivity.java
new file mode 100644
index 0000000..11d7c32
--- /dev/null
+++ b/tests/localJars/app/src/main/java/com/example/android/multiproject/MainActivity.java
@@ -0,0 +1,21 @@
+package com.example.android.multiproject;
+
+import android.app.Activity;
+import android.view.View;
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.example.android.multiproject.library.ShowPeopleActivity;
+
+public class MainActivity extends Activity {
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.main);
+    }
+
+    public void sendMessage(View view) {
+        Intent intent = new Intent(this, ShowPeopleActivity.class);
+        startActivity(intent);
+    }
+}
diff --git a/tests/localJars/app/src/main/res/drawable-hdpi/ic_launcher.png b/tests/localJars/app/src/main/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 0000000..96a442e
--- /dev/null
+++ b/tests/localJars/app/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/tests/localJars/app/src/main/res/drawable-ldpi/ic_launcher.png b/tests/localJars/app/src/main/res/drawable-ldpi/ic_launcher.png
new file mode 100644
index 0000000..9923872
--- /dev/null
+++ b/tests/localJars/app/src/main/res/drawable-ldpi/ic_launcher.png
diff --git a/tests/localJars/app/src/main/res/drawable-mdpi/ic_launcher.png b/tests/localJars/app/src/main/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 0000000..359047d
--- /dev/null
+++ b/tests/localJars/app/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/tests/localJars/app/src/main/res/drawable-xhdpi/ic_launcher.png b/tests/localJars/app/src/main/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..71c6d76
--- /dev/null
+++ b/tests/localJars/app/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/tests/localJars/app/src/main/res/layout/main.xml b/tests/localJars/app/src/main/res/layout/main.xml
new file mode 100644
index 0000000..ccc59fb
--- /dev/null
+++ b/tests/localJars/app/src/main/res/layout/main.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+    <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/button_send"
+            android:onClick="sendMessage" />
+</LinearLayout>
diff --git a/tests/localJars/app/src/main/res/values/strings.xml b/tests/localJars/app/src/main/res/values/strings.xml
new file mode 100644
index 0000000..e1f49b6
--- /dev/null
+++ b/tests/localJars/app/src/main/res/values/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Composite App</string>
+    <string name="button_send">Go</string>
+</resources>
diff --git a/tests/localJars/baseLibrary/build.gradle b/tests/localJars/baseLibrary/build.gradle
new file mode 100644
index 0000000..4700d90
--- /dev/null
+++ b/tests/localJars/baseLibrary/build.gradle
@@ -0,0 +1,11 @@
+apply plugin: 'android-library'
+
+android {
+    compileSdkVersion 15
+//    buildToolsVersion "1.0"
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: '*.jar')
+    compile 'com.google.guava:guava:11.0.2'
+}
diff --git a/tests/localJars/baseLibrary/libs/util-1.0.jar b/tests/localJars/baseLibrary/libs/util-1.0.jar
new file mode 100644
index 0000000..55471dc
--- /dev/null
+++ b/tests/localJars/baseLibrary/libs/util-1.0.jar
diff --git a/tests/localJars/baseLibrary/src/main/AndroidManifest.xml b/tests/localJars/baseLibrary/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..54d079c
--- /dev/null
+++ b/tests/localJars/baseLibrary/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.example.android.multiproject.library.base">
+</manifest>
diff --git a/tests/localJars/baseLibrary/src/main/java/com/sample/android/multiproject/library/PersonView.java b/tests/localJars/baseLibrary/src/main/java/com/sample/android/multiproject/library/PersonView.java
new file mode 100644
index 0000000..b218532
--- /dev/null
+++ b/tests/localJars/baseLibrary/src/main/java/com/sample/android/multiproject/library/PersonView.java
@@ -0,0 +1,13 @@
+package com.example.android.multiproject.library;
+
+import android.widget.TextView;
+import android.content.Context;
+import com.example.android.multiproject.person.Person;
+
+class PersonView extends TextView {
+    public PersonView(Context context, Person person) {
+        super(context);
+        setTextSize(20);
+        setText(person.getName());
+    }
+}
diff --git a/tests/localJars/build.gradle b/tests/localJars/build.gradle
new file mode 100644
index 0000000..cef83b9
--- /dev/null
+++ b/tests/localJars/build.gradle
@@ -0,0 +1,18 @@
+buildscript {
+    repositories {
+        maven { url '../../repo' }
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:0.4-SNAPSHOT'
+    }
+}
+
+allprojects {
+    version = '1.0'
+
+    repositories {
+        mavenCentral()
+    }
+}
+
+apply plugin: 'android-reporting'
\ No newline at end of file
diff --git a/tests/localJars/library/build.gradle b/tests/localJars/library/build.gradle
new file mode 100644
index 0000000..6d07c6a
--- /dev/null
+++ b/tests/localJars/library/build.gradle
@@ -0,0 +1,10 @@
+apply plugin: 'android-library'
+
+android {
+    compileSdkVersion 15
+//    buildToolsVersion "1.0"
+}
+
+dependencies {
+    compile project(':baseLibrary')
+}
diff --git a/tests/localJars/library/src/main/AndroidManifest.xml b/tests/localJars/library/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..2bc9331
--- /dev/null
+++ b/tests/localJars/library/src/main/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="com.example.android.multiproject.library">
+    <application>
+        <activity
+                android:name="ShowPeopleActivity"
+                android:label="@string/title_activity_display_message" >
+            </activity>
+    </application>
+</manifest>
diff --git a/tests/localJars/library/src/main/java/com/example/android/multiproject/library/ShowPeopleActivity.java b/tests/localJars/library/src/main/java/com/example/android/multiproject/library/ShowPeopleActivity.java
new file mode 100644
index 0000000..a3f2195
--- /dev/null
+++ b/tests/localJars/library/src/main/java/com/example/android/multiproject/library/ShowPeopleActivity.java
@@ -0,0 +1,30 @@
+package com.example.android.multiproject.library;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.content.Intent;
+import android.widget.TextView;
+import android.widget.LinearLayout;
+
+import java.lang.String;
+import java.util.Arrays;
+
+import com.example.android.multiproject.person.Person;
+import com.example.android.multiproject.person.People;
+
+public class ShowPeopleActivity extends Activity {
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        LinearLayout group = new LinearLayout(this);
+        group.setOrientation(LinearLayout.VERTICAL);
+
+        Iterable<Person> people = new People();
+        for (Person person : people) {
+            group.addView(new PersonView(this, person));
+        }
+
+        setContentView(group);
+    }
+}
diff --git a/tests/localJars/library/src/main/res/values/strings.xml b/tests/localJars/library/src/main/res/values/strings.xml
new file mode 100644
index 0000000..45e9dbb
--- /dev/null
+++ b/tests/localJars/library/src/main/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="title_activity_display_message">People</string>
+</resources>
diff --git a/tests/localJars/settings.gradle b/tests/localJars/settings.gradle
new file mode 100644
index 0000000..1b43700
--- /dev/null
+++ b/tests/localJars/settings.gradle
@@ -0,0 +1,3 @@
+include 'app'
+include 'library'
+include 'baseLibrary'
diff --git a/tests/localJars/util/build.gradle b/tests/localJars/util/build.gradle
new file mode 100644
index 0000000..dff7725
--- /dev/null
+++ b/tests/localJars/util/build.gradle
@@ -0,0 +1,8 @@
+apply plugin: 'java'
+
+dependencies {
+    compile 'com.google.guava:guava:11.0.2'
+}
+
+sourceCompatibility = "1.6"
+targetCompatibility = "1.6"
diff --git a/tests/localJars/util/src/main/java/com/example/android/multiproject/person/People.java b/tests/localJars/util/src/main/java/com/example/android/multiproject/person/People.java
new file mode 100644
index 0000000..8b99248
--- /dev/null
+++ b/tests/localJars/util/src/main/java/com/example/android/multiproject/person/People.java
@@ -0,0 +1,10 @@
+package com.example.android.multiproject.person;
+
+import java.util.Iterator;
+import com.google.common.collect.Lists;
+
+public class People implements Iterable<Person> {
+    public Iterator<Person> iterator() {
+        return Lists.newArrayList(new Person("Fred"), new Person("Barney")).iterator();
+    }
+}
diff --git a/tests/localJars/util/src/main/java/com/example/android/multiproject/person/Person.java b/tests/localJars/util/src/main/java/com/example/android/multiproject/person/Person.java
new file mode 100644
index 0000000..2f4aa9f
--- /dev/null
+++ b/tests/localJars/util/src/main/java/com/example/android/multiproject/person/Person.java
@@ -0,0 +1,13 @@
+package com.example.android.multiproject.person;
+
+public class Person {
+    private final String name;
+
+    public Person(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+}