Switch to new dx

Summary: Replace dx-from-kitkat with the dx based on 5.1.1_r8 Test Plan: ant test
fbauzac · Jul 17, 2015 · cf11832 · cf11832
1 parent 2ddb600
commit cf11832
Show file tree

Hide file tree

Showing 2,204 changed files with 8 additions and 111,587 deletions.
diff --git a/.classpath b/.classpath
@@ -58,7 +58,7 @@
 	<classpathentry kind="lib" path="third-party/java/stringtemplate/ST-4.0.8.jar"/>
 	<classpathentry kind="lib" path="third-party/java/testng/testng-6.8.jar"/>
 	<classpathentry kind="lib" path="third-party/java/xz-java-1.3/xz-1.3.jar" sourcepath="third-party/java/xz-java-1.3/xz-1.3-sources.jar"/>
-	<classpathentry kind="src" path="third-party/java/dx-from-kitkat/src"/>
+	<classpathentry kind="src" path="third-party/java/dx/src"/>
 	<classpathentry kind="src" path=".apt_generated">
 		<attributes>
 			<attribute name="optional" value="true"/>

diff --git a/.watchmanconfig b/.watchmanconfig
@@ -16,6 +16,6 @@
     "test/com/facebook/buck/test/cache/testdata",
     "test/com/facebook/buck/test/labels/testdata",
     "test/com/facebook/buck/test/result/groups/testdata",
-    "third-party/java/dx-from-kitkat"
+    "third-party/java/dx"
   ]
 }
diff --git a/buck.iml b/buck.iml
@@ -10,7 +10,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/third-party/java/dx-from-kitkat/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/third-party/java/dx/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/build-ij/immutables" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build-ij/immutables-test" isTestSource="true" generated="true" />
       <excludeFolder url="file://$MODULE_DIR$/buck-out" />
@@ -48,4 +48,4 @@
     <orderEntry type="library" name="jacoco" level="project" />
     <orderEntry type="library" name="immutables-annotations" level="project" />
   </component>
-</module>
+</module>
diff --git a/build.xml b/build.xml
@@ -30,7 +30,7 @@
   <property name="test.debug_port" value="8787" />
   <property name="lint.outputpath" value="${build.dir}/lint.output" />
 
-  <property name="dx.base.dir" value="${basedir}/third-party/java/dx-from-kitkat" />
+  <property name="dx.base.dir" value="${basedir}/third-party/java/dx" />
   <property name="dx.src.dir" value="${dx.base.dir}/src" />
   <property name="dx.test.dir" value="${dx.base.dir}/tests" />
   <property name="dx.etc.dir" value="${dx.base.dir}/etc" />

diff --git a/programs/BUCK b/programs/BUCK
@@ -41,7 +41,7 @@ BUCK_CORE_RESOURCES = {
     'bootstrapper_jar': '//src/com/facebook/buck/cli/bootstrapper:bootstrapper',
     'buck_package_info': ':gen_buck_package_info',
     'buck_server': '//src/com/facebook/buck/cli:main-fixed',
-    'dx': '//third-party/java/dx-from-kitkat:etc_dx',
+    'dx': '//third-party/java/dx:etc_dx',
     'jacoco_agent_jar': '//third-party/java/jacoco:agent',
     'logging_config_file': '//config:logging.properties',
     'native_exopackage_fake_path': '//assets/android:native-exopackage-fakes.apk',

diff --git a/programs/buck_repo.py b/programs/buck_repo.py
@@ -64,7 +64,7 @@
     "android_agent_path": "assets/android/agent.apk",
     "buck_client": "build/ng",
     "buck_server": "bin/buck",
-    "dx": "third-party/java/dx-from-kitkat/etc/dx",
+    "dx": "third-party/java/dx/etc/dx",
     "jacoco_agent_jar": "third-party/java/jacoco/jacocoagent.jar",
     "logging_config_file": "config/logging.properties",
     "native_exopackage_fake_path": "assets/android/native-exopackage-fakes.apk",

diff --git a/src/com/facebook/buck/android/BUCK b/src/com/facebook/buck/android/BUCK
@@ -248,7 +248,7 @@ java_immutables_library(
     '//src/com/facebook/buck/zip:stream',
     '//third-party/java/aosp:aosp',
     '//third-party/java/asm:asm',
-    '//third-party/java/dx-from-kitkat:dx',
+    '//third-party/java/dx:dx',
     '//third-party/java/guava:guava',
     '//third-party/java/jackson:jackson-core',
     '//third-party/java/jackson:jackson-databind',

diff --git a/third-party/java/dx-do_not_use/BUCK b/third-party/java/dx-do_not_use/BUCK
diff --git a/third-party/java/dx-from-kitkat/.classpath b/third-party/java/dx-from-kitkat/.classpath
diff --git a/third-party/java/dx-from-kitkat/.project b/third-party/java/dx-from-kitkat/.project
diff --git a/third-party/java/dx-from-kitkat/Android.mk b/third-party/java/dx-from-kitkat/Android.mk