am de0af86d: am 49662bcb: Merge "created a profile module" into studio-1.3-dev automerge: f361ee2 automerge: 08ceda7

* commit 'de0af86d17efe9ad708c144ce754a33ef09ad726':
  created a profile module

19 files changed, 71 insertions, 1 deletions

diff --git a/.idea/modules.xml b/.idea/modules.xml
index cfcf4fee5e..6ffad9959c 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -27,6 +27,7 @@
       <module fileurl="file://$PROJECT_DIR$/build-system/manifest-merger/manifest-merger-base.iml" filepath="$PROJECT_DIR$/build-system/manifest-merger/manifest-merger-base.iml" />
       <module fileurl="file://$PROJECT_DIR$/ninepatch/ninepatch.iml" filepath="$PROJECT_DIR$/ninepatch/ninepatch.iml" />
       <module fileurl="file://$PROJECT_DIR$/perflib/perflib.iml" filepath="$PROJECT_DIR$/perflib/perflib.iml" />
+      <module fileurl="file://$PROJECT_DIR$/build-system/profile/profile.iml" filepath="$PROJECT_DIR$/build-system/profile/profile.iml" />
       <module fileurl="file://$PROJECT_DIR$/build-system/project-test/project-test.iml" filepath="$PROJECT_DIR$/build-system/project-test/project-test.iml" />
       <module fileurl="file://$PROJECT_DIR$/build-system/project-test-lib/project-test-lib.iml" filepath="$PROJECT_DIR$/build-system/project-test-lib/project-test-lib.iml" />
       <module fileurl="file://$PROJECT_DIR$/rule-api/rule-api.iml" filepath="$PROJECT_DIR$/rule-api/rule-api.iml" />
diff --git a/build-system/builder/build.gradle b/build-system/builder/build.gradle
index 1c1bc2d48b..05e41d0ea1 100644
--- a/build-system/builder/build.gradle
+++ b/build-system/builder/build.gradle
@@ -83,3 +83,28 @@ public final class Version {
 }
 
 tasks.compileJava.dependsOn generateVersionConstantsJava
+
+configurations {
+    provided
+    sourcesProvided
+}
+
+dependencies {
+    provided(project(':base:profile')) {
+        transitive = false
+    }
+    sourcesProvided(project(path:':base:profile', configuration:'sourcesOnly')) {
+        transitive = false
+    }
+}
+
+sourceSets.main.compileClasspath += [configurations.provided]
+tasks.compileJava.dependsOn(configurations.provided)
+tasks.sourcesJar.dependsOn(configurations.sourcesProvided)
+
+tasks.jar {
+    from({zipTree(configurations.provided.singleFile)})
+}
+tasks.sourcesJar {
+    from({zipTree(configurations.sourcesProvided.singleFile)})
+}
\ No newline at end of file
diff --git a/build-system/builder/builder.iml b/build-system/builder/builder.iml
index 964e73744a..7c62a1c92e 100644
--- a/build-system/builder/builder.iml
+++ b/build-system/builder/builder.iml
@@ -13,6 +13,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="profile" exported="" />
     <orderEntry type="module" module-name="builder-test-api" exported="" />
     <orderEntry type="module" module-name="builder-model" exported="" />
     <orderEntry type="module" module-name="testutils" scope="TEST" />
@@ -23,7 +24,6 @@
     <orderEntry type="module" module-name="sdk-common-base" />
     <orderEntry type="module" module-name="manifest-merger-base" />
     <orderEntry type="library" exported="" name="asm-tools" level="project" />
-    <orderEntry type="library" name="gson" level="project" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="library" name="jack-api-0.1" level="project" />
   </component>
diff --git a/build-system/profile/build.gradle b/build-system/profile/build.gradle
new file mode 100644
index 0000000000..cfd3bdd390
--- /dev/null
+++ b/build-system/profile/build.gradle
@@ -0,0 +1,24 @@
+apply plugin: 'java'
+
+dependencies {
+    compile project(':base:annotations')
+    compile project(':base:common')
+    compile 'com.google.guava:guava:17.0'
+    compile 'com.google.code.gson:gson:2.2.4'
+
+    testCompile 'junit:junit:4.12'
+    testCompile 'org.mockito:mockito-all:1.9.5'
+}
+
+configurations {
+    sourcesOnly
+}
+
+task sourcesJar(type: Jar, dependsOn: classes) {
+    classifier = 'sources'
+    from sourceSets.main.allSource
+}
+
+artifacts {
+    sourcesOnly sourcesJar
+}
\ No newline at end of file
diff --git a/build-system/profile/profile.iml b/build-system/profile/profile.iml
new file mode 100644
index 0000000000..a6e5be25c3
--- /dev/null
+++ b/build-system/profile/profile.iml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="guava-tools" level="project" />
+    <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
+    <orderEntry type="library" scope="TEST" name="mockito" level="project" />
+    <orderEntry type="module" module-name="android-annotations" exported="" />
+    <orderEntry type="module" module-name="common" exported="" />
+    <orderEntry type="library" name="gson" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/build-system/builder/src/main/java/com/android/builder/profile/ExecutionRecord.java b/build-system/profile/src/main/java/com/android/builder/profile/ExecutionRecord.java
index 8c4378a1ec..8c4378a1ec 100644
--- a/build-system/builder/src/main/java/com/android/builder/profile/ExecutionRecord.java
+++ b/build-system/profile/src/main/java/com/android/builder/profile/ExecutionRecord.java
diff --git a/build-system/builder/src/main/java/com/android/builder/profile/ExecutionType.java b/build-system/profile/src/main/java/com/android/builder/profile/ExecutionType.java
index e6a6d0722d..e6a6d0722d 100644
--- a/build-system/builder/src/main/java/com/android/builder/profile/ExecutionType.java
+++ b/build-system/profile/src/main/java/com/android/builder/profile/ExecutionType.java
diff --git a/build-system/builder/src/main/java/com/android/builder/profile/ProcessRecorder.java b/build-system/profile/src/main/java/com/android/builder/profile/ProcessRecorder.java
index 9c26561441..9c26561441 100644
--- a/build-system/builder/src/main/java/com/android/builder/profile/ProcessRecorder.java
+++ b/build-system/profile/src/main/java/com/android/builder/profile/ProcessRecorder.java
diff --git a/build-system/builder/src/main/java/com/android/builder/profile/ProcessRecorderFactory.java b/build-system/profile/src/main/java/com/android/builder/profile/ProcessRecorderFactory.java
index 7ab42690c5..7ab42690c5 100644
--- a/build-system/builder/src/main/java/com/android/builder/profile/ProcessRecorderFactory.java
+++ b/build-system/profile/src/main/java/com/android/builder/profile/ProcessRecorderFactory.java
diff --git a/build-system/builder/src/main/java/com/android/builder/profile/Recorder.java b/build-system/profile/src/main/java/com/android/builder/profile/Recorder.java
index b83d4191d8..b83d4191d8 100644
--- a/build-system/builder/src/main/java/com/android/builder/profile/Recorder.java
+++ b/build-system/profile/src/main/java/com/android/builder/profile/Recorder.java
diff --git a/build-system/builder/src/main/java/com/android/builder/profile/ThreadRecorder.java b/build-system/profile/src/main/java/com/android/builder/profile/ThreadRecorder.java
index 94c8baa57d..94c8baa57d 100644
--- a/build-system/builder/src/main/java/com/android/builder/profile/ThreadRecorder.java
+++ b/build-system/profile/src/main/java/com/android/builder/profile/ThreadRecorder.java
diff --git a/build-system/builder/src/main/java/com/android/builder/tasks/BooleanLatch.java b/build-system/profile/src/main/java/com/android/builder/tasks/BooleanLatch.java
index d5dab3b6ca..d5dab3b6ca 100644
--- a/build-system/builder/src/main/java/com/android/builder/tasks/BooleanLatch.java
+++ b/build-system/profile/src/main/java/com/android/builder/tasks/BooleanLatch.java
diff --git a/build-system/builder/src/main/java/com/android/builder/tasks/Job.java b/build-system/profile/src/main/java/com/android/builder/tasks/Job.java
index a10ae8d60f..a10ae8d60f 100644
--- a/build-system/builder/src/main/java/com/android/builder/tasks/Job.java
+++ b/build-system/profile/src/main/java/com/android/builder/tasks/Job.java
diff --git a/build-system/builder/src/main/java/com/android/builder/tasks/JobContext.java b/build-system/profile/src/main/java/com/android/builder/tasks/JobContext.java
index 969fb77cbc..969fb77cbc 100644
--- a/build-system/builder/src/main/java/com/android/builder/tasks/JobContext.java
+++ b/build-system/profile/src/main/java/com/android/builder/tasks/JobContext.java
diff --git a/build-system/builder/src/main/java/com/android/builder/tasks/QueueThreadContext.java b/build-system/profile/src/main/java/com/android/builder/tasks/QueueThreadContext.java
index f5c3a2bee9..f5c3a2bee9 100644
--- a/build-system/builder/src/main/java/com/android/builder/tasks/QueueThreadContext.java
+++ b/build-system/profile/src/main/java/com/android/builder/tasks/QueueThreadContext.java
diff --git a/build-system/builder/src/main/java/com/android/builder/tasks/Task.java b/build-system/profile/src/main/java/com/android/builder/tasks/Task.java
index bca1d40a33..bca1d40a33 100644
--- a/build-system/builder/src/main/java/com/android/builder/tasks/Task.java
+++ b/build-system/profile/src/main/java/com/android/builder/tasks/Task.java
diff --git a/build-system/builder/src/main/java/com/android/builder/tasks/WorkQueue.java b/build-system/profile/src/main/java/com/android/builder/tasks/WorkQueue.java
index 14a64b89f3..14a64b89f3 100644
--- a/build-system/builder/src/main/java/com/android/builder/tasks/WorkQueue.java
+++ b/build-system/profile/src/main/java/com/android/builder/tasks/WorkQueue.java
diff --git a/build-system/builder/src/test/java/com/android/builder/profile/ProcessRecorderTest.java b/build-system/profile/src/test/java/com/android/builder/profile/ProcessRecorderTest.java
index ceed1396ce..ceed1396ce 100644
--- a/build-system/builder/src/test/java/com/android/builder/profile/ProcessRecorderTest.java
+++ b/build-system/profile/src/test/java/com/android/builder/profile/ProcessRecorderTest.java
diff --git a/build-system/builder/src/test/java/com/android/builder/profile/ThreadRecorderTest.java b/build-system/profile/src/test/java/com/android/builder/profile/ThreadRecorderTest.java
index f77b5eda8e..f77b5eda8e 100644
--- a/build-system/builder/src/test/java/com/android/builder/profile/ThreadRecorderTest.java
+++ b/build-system/profile/src/test/java/com/android/builder/profile/ThreadRecorderTest.java