diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-06-12 08:02:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-12 08:02:08 -0700 |
| commit | bf133cf2dd3fd3a32f98f8e68045cd0c591fcd93 (patch) | |
| tree | 032f71c11ef50fb60031e1f1d7703c720ee4e941 /ide | |
| parent | 547975cf50510a94caf0c1d247e8d3192b5c0d85 (diff) | |
| parent | 401a65b7846fb87991142d9caa4a6176f75bbe27 (diff) | |
| download | android_development-bf133cf2dd3fd3a32f98f8e68045cd0c591fcd93.tar.gz android_development-bf133cf2dd3fd3a32f98f8e68045cd0c591fcd93.tar.bz2 android_development-bf133cf2dd3fd3a32f98f8e68045cd0c591fcd93.zip | |
am 401a65b7: resolved conflicts for merge of 45cb1b0a to jb-dev-plus-aosp
* commit '401a65b7846fb87991142d9caa4a6176f75bbe27':
Fix Eclipse classpath file for ICS.
Diffstat (limited to 'ide')
| -rw-r--r-- | ide/eclipse/.classpath | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ide/eclipse/.classpath b/ide/eclipse/.classpath index 1a939a064..f40ae6f37 100644 --- a/ide/eclipse/.classpath +++ b/ide/eclipse/.classpath @@ -93,6 +93,7 @@ <classpathentry kind="src" path="out/target/common/obj/APPS/QuickSearchBox_intermediates/src/src"/> <classpathentry kind="src" path="out/target/common/obj/JAVA_LIBRARIES/android-common-carousel_intermediates/src/renderscript/src"/> <classpathentry kind="src" path="out/target/common/obj/JAVA_LIBRARIES/com.android.emailcommon_intermediates/src/src"/> + <classpathentry kind="lib" path="out/target/common/obj/JAVA_LIBRARIES/filterfw_intermediates/classes-jarjar.jar"/> <classpathentry kind="src" path="out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java"/> <classpathentry kind="src" path="out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/keystore/java"/> <classpathentry kind="src" path="out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/location/java"/> @@ -111,8 +112,8 @@ <classpathentry kind="lib" path="out/target/common/obj/JAVA_LIBRARIES/bouncycastle_intermediates/classes-jarjar.jar"/> <classpathentry kind="lib" path="out/target/common/obj/JAVA_LIBRARIES/android-support-v4_intermediates/javalib.jar"/> <classpathentry kind="lib" path="out/target/common/obj/JAVA_LIBRARIES/core-junit_intermediates/classes.jar"/> - <classpathentry kind="lib" path="out/target/common/obj/JAVA_LIBRARIES/google-common_intermediates/javalib.jar"/> - <classpathentry kind="lib" path="out/target/common/obj/JAVA_LIBRARIES/gsf-client_intermediates/javalib.jar"/> + <classpathentry kind="lib" path="out/target/common/obj/JAVA_LIBRARIES/android-support-v13_intermediates/javalib.jar"/> + <classpathentry kind="lib" path="out/target/common/obj/JAVA_LIBRARIES/android-common_intermediates/javalib.jar"/> <classpathentry kind="lib" path="out/target/common/obj/JAVA_LIBRARIES/guava_intermediates/javalib.jar"/> <classpathentry kind="lib" path="packages/apps/Calculator/arity-2.1.2.jar"/> <classpathentry kind="lib" path="out/target/common/obj/JAVA_LIBRARIES/junit-runner_intermediates/javalib.jar"/> |