Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <?xml version="1.0" encoding="UTF-8"?> | 1 <?xml version="1.0" encoding="UTF-8"?> |
| 2 <!-- {% block header_message %} | 2 <!-- {% block header_message %} |
| 3 | 3 |
| 4 Eclipse classpath. See instructions at | 4 Eclipse classpath. See instructions at |
| 5 https://www.chromium.org/developers/android-eclipse-dev for setting up Eclipse | 5 https://www.chromium.org/developers/android-eclipse-dev for setting up Eclipse |
| 6 for Chrome Android development. | 6 for Chrome Android development. |
| 7 | 7 |
| 8 Obsolete entries can be found using: | 8 Obsolete entries can be found using: |
| 9 | 9 |
| 10 for f in $(grep -oP '(?<= path=")[^"]*' tools/android/eclipse/.classpath); do | 10 for f in $(grep -oP '(?<= path=")[^"]*' tools/android/eclipse/.classpath); do |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 105 <classpathentry kind="src" path="third_party/cacheinvalidation/src/java"/> | 105 <classpathentry kind="src" path="third_party/cacheinvalidation/src/java"/> |
| 106 <classpathentry kind="src" path="third_party/custom_tabs_client/src/customta bs/src"/> | 106 <classpathentry kind="src" path="third_party/custom_tabs_client/src/customta bs/src"/> |
| 107 <classpathentry kind="src" path="third_party/custom_tabs_client/src/Applicat ion/src/main/java"/> | 107 <classpathentry kind="src" path="third_party/custom_tabs_client/src/Applicat ion/src/main/java"/> |
| 108 <classpathentry kind="src" path="third_party/custom_tabs_client/src/shared/s rc/main/java"/> | 108 <classpathentry kind="src" path="third_party/custom_tabs_client/src/shared/s rc/main/java"/> |
| 109 <classpathentry kind="src" path="third_party/gif_player/src"/> | 109 <classpathentry kind="src" path="third_party/gif_player/src"/> |
| 110 <classpathentry kind="src" path="third_party/jmake/src"/> | 110 <classpathentry kind="src" path="third_party/jmake/src"/> |
| 111 <classpathentry kind="src" path="third_party/junit/src/src/main/java"/> | 111 <classpathentry kind="src" path="third_party/junit/src/src/main/java"/> |
| 112 <classpathentry kind="src" path="third_party/leakcanary/src/leakcanary-andro id/src/main/java"/> | 112 <classpathentry kind="src" path="third_party/leakcanary/src/leakcanary-andro id/src/main/java"/> |
| 113 <classpathentry kind="src" path="third_party/leakcanary/src/leakcanary-watch er/src/main/java"/> | 113 <classpathentry kind="src" path="third_party/leakcanary/src/leakcanary-watch er/src/main/java"/> |
| 114 <classpathentry kind="src" path="third_party/mockito/src/src/main/java"/> | 114 <classpathentry kind="src" path="third_party/mockito/src/src/main/java"/> |
| 115 <classpathentry kind="src" path="third_party/robolectric/robolectric/robolec tric/src/main/java"/> | |
| 116 <classpathentry kind="src" path="third_party/robolectric/robolectric/robolec tric/src/main/java"/> | |
| 117 <classpathentry kind="src" path="third_party/robolectric/robolectric/robolec tric-annotations/src/main/java"/> | 115 <classpathentry kind="src" path="third_party/robolectric/robolectric/robolec tric-annotations/src/main/java"/> |
|
dgn
2016/10/03 15:04:06
I get a merge conflict when patching in:
<<<<<<<
| |
| 118 <classpathentry kind="src" path="third_party/robolectric/robolectric/robolec tric-shadows/shadows-core/src/main/java"/> | 116 <classpathentry kind="src" path="third_party/robolectric/robolectric/robolec tric-resources/src/main/java"/> |
| 119 <classpathentry kind="src" path="third_party/robolectric/robolectric/robolec tric-utils/src/main/java"/> | |
| 120 <classpathentry kind="src" path="tools/android/findbugs_plugin/src"/> | 117 <classpathentry kind="src" path="tools/android/findbugs_plugin/src"/> |
| 121 <classpathentry kind="src" path="tools/android/findbugs_plugin/test/java/src "/> | 118 <classpathentry kind="src" path="tools/android/findbugs_plugin/test/java/src "/> |
| 122 <classpathentry kind="src" path="tools/android/memconsumer/java/src"/> | 119 <classpathentry kind="src" path="tools/android/memconsumer/java/src"/> |
| 123 <classpathentry kind="src" path="ui/android/java/src"/> | 120 <classpathentry kind="src" path="ui/android/java/src"/> |
| 124 <classpathentry kind="src" path="ui/android/javatests/src"/> | 121 <classpathentry kind="src" path="ui/android/javatests/src"/> |
| 125 <classpathentry kind="src" path="out/Debug/android_webview_test_apk/gen"/> | 122 <classpathentry kind="src" path="out/Debug/android_webview_test_apk/gen"/> |
| 126 <classpathentry kind="src" path="out/Debug/chrome_public_apk/gen"/> | 123 <classpathentry kind="src" path="out/Debug/chrome_public_apk/gen"/> |
| 127 <classpathentry kind="src" path="out/Debug/content_shell_apk/gen"/> | 124 <classpathentry kind="src" path="out/Debug/content_shell_apk/gen"/> |
| 128 <classpathentry kind="src" path="out/Debug/gen/enums/accessibility_java"/> | 125 <classpathentry kind="src" path="out/Debug/gen/enums/accessibility_java"/> |
| 129 <classpathentry kind="src" path="out/Debug/gen/enums/activity_type_ids_java" /> | 126 <classpathentry kind="src" path="out/Debug/gen/enums/activity_type_ids_java" /> |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 215 <attribute name="javadoc_location" value="http://developer.android.c om/reference/"/> | 212 <attribute name="javadoc_location" value="http://developer.android.c om/reference/"/> |
| 216 </attributes> | 213 </attributes> |
| 217 </classpathentry> | 214 </classpathentry> |
| 218 <classpathentry kind="lib" path="third_party/android_tools/sdk/platforms/and roid-23/data/layoutlib.jar" sourcepath="third_party/android_tools/sdk/sources/"/ > | 215 <classpathentry kind="lib" path="third_party/android_tools/sdk/platforms/and roid-23/data/layoutlib.jar" sourcepath="third_party/android_tools/sdk/sources/"/ > |
| 219 <classpathentry kind="lib" path="third_party/android_tools/sdk/platforms/and roid-23/uiautomator.jar" sourcepath="third_party/android_tools/sdk/sources"/> | 216 <classpathentry kind="lib" path="third_party/android_tools/sdk/platforms/and roid-23/uiautomator.jar" sourcepath="third_party/android_tools/sdk/sources"/> |
| 220 <classpathentry kind="lib" path="third_party/android_tools/sdk/extras/androi d/support/design/libs/android-support-design.jar" sourcepath="third_party/androi d_tools/sdk/sources"/> | 217 <classpathentry kind="lib" path="third_party/android_tools/sdk/extras/androi d/support/design/libs/android-support-design.jar" sourcepath="third_party/androi d_tools/sdk/sources"/> |
| 221 <classpathentry kind="lib" path="third_party/android_tools/sdk/extras/androi d/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar" sourcepath="th ird_party/android_tools/sdk/sources"/> | 218 <classpathentry kind="lib" path="third_party/android_tools/sdk/extras/androi d/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar" sourcepath="th ird_party/android_tools/sdk/sources"/> |
| 222 <classpathentry kind="lib" path="third_party/android_tools/sdk/extras/androi d/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar" sourcepath=" third_party/android_tools/sdk/sources"/> | 219 <classpathentry kind="lib" path="third_party/android_tools/sdk/extras/androi d/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar" sourcepath=" third_party/android_tools/sdk/sources"/> |
| 223 <classpathentry kind="lib" path="third_party/android_tools/sdk/extras/androi d/support/v13/android-support-v13.jar" sourcepath="third_party/android_tools/sdk /sources"/> | 220 <classpathentry kind="lib" path="third_party/android_tools/sdk/extras/androi d/support/v13/android-support-v13.jar" sourcepath="third_party/android_tools/sdk /sources"/> |
| 224 <classpathentry kind="lib" path="third_party/android_tools/sdk/extras/androi d/support/v7/appcompat/libs/android-support-v7-appcompat.jar" sourcepath="third_ party/android_tools/sdk/sources"/> | 221 <classpathentry kind="lib" path="third_party/android_tools/sdk/extras/androi d/support/v7/appcompat/libs/android-support-v7-appcompat.jar" sourcepath="third_ party/android_tools/sdk/sources"/> |
| 222 <classpathentry kind="lib" path="third_party/bouncycastle/lib/bcprov-jdk16-1 .46.jar"/> | |
| 225 <classpathentry kind="lib" path="third_party/findbugs/lib/findbugs.jar"/> | 223 <classpathentry kind="lib" path="third_party/findbugs/lib/findbugs.jar"/> |
| 226 <classpathentry kind="lib" path="third_party/junit/src/lib/hamcrest-core-1.1 .jar"/> | 224 <classpathentry kind="lib" path="third_party/intellij/lib/annotations-12.0.j ar"/> |
| 225 <classpathentry kind="lib" path="third_party/junit/src/lib/hamcrest-core-1.3 .jar" sourcepath="third_party/junit/src/lib/hamcrest-core-1.3-sources.jar"/> | |
| 227 <classpathentry kind="lib" path="third_party/mockito/src/lib/repackaged/cgli b-and-asm-1.0.jar" sourcepath="third_party/mockito/src/lib/sources/cglib-and-asm -1.0-sources.jar"/> | 226 <classpathentry kind="lib" path="third_party/mockito/src/lib/repackaged/cgli b-and-asm-1.0.jar" sourcepath="third_party/mockito/src/lib/sources/cglib-and-asm -1.0-sources.jar"/> |
| 227 <classpathentry kind="lib" path="third_party/sqlite4java/lib/sqlite4java-0.2 82.jar"/> | |
| 228 <classpathentry kind="lib" path="out/Debug/lib.java/cacheinvalidation_proto_ java.jar"/> | 228 <classpathentry kind="lib" path="out/Debug/lib.java/cacheinvalidation_proto_ java.jar"/> |
| 229 <classpathentry kind="lib" path="out/Debug/lib.java/content_java.jar"/> | 229 <classpathentry kind="lib" path="out/Debug/lib.java/content_java.jar"/> |
| 230 <classpathentry kind="lib" path="out/Debug/lib.java/jsr_305_javalib.jar"/> | 230 <classpathentry kind="lib" path="out/Debug/lib.java/jsr_305_javalib.jar"/> |
| 231 <classpathentry kind="lib" path="out/Debug/lib.java/net_java.jar"/> | 231 <classpathentry kind="lib" path="out/Debug/lib.java/net_java.jar"/> |
| 232 | 232 |
| 233 <!-- GN: R (resources) and NativeLibraries classes. --> | 233 <!-- GN: R (resources) and NativeLibraries classes. --> |
| 234 <classpathentry kind="lib" path="out/Debug/gen/chrome/android/chrome_public_ apk/chrome_public_apk.jar"/> | 234 <classpathentry kind="lib" path="out/Debug/gen/chrome/android/chrome_public_ apk/chrome_public_apk.jar"/> |
| 235 | 235 |
| 236 <!-- GN: library jars, includes generated Java files. --> | 236 <!-- GN: library jars, includes generated Java files. --> |
| 237 <classpathentry kind="lib" path="out/Debug/lib.java/android_webview/android_ webview_java.jar"/> | 237 <classpathentry kind="lib" path="out/Debug/lib.java/android_webview/android_ webview_java.jar"/> |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 271 <classpathentry kind="lib" path="out/Debug/lib.java/sync/android/sync_java.j ar"/> | 271 <classpathentry kind="lib" path="out/Debug/lib.java/sync/android/sync_java.j ar"/> |
| 272 <classpathentry kind="lib" path="out/Debug/lib.java/sync/test_support_sync_p roto_java.jar"/> | 272 <classpathentry kind="lib" path="out/Debug/lib.java/sync/test_support_sync_p roto_java.jar"/> |
| 273 <classpathentry kind="lib" path="out/Debug/lib.java/third_party/android_data _chart/android_data_chart_java.jar"/> | 273 <classpathentry kind="lib" path="out/Debug/lib.java/third_party/android_data _chart/android_data_chart_java.jar"/> |
| 274 <classpathentry kind="lib" path="out/Debug/lib.java/third_party/android_medi a/android_media_java.jar"/> | 274 <classpathentry kind="lib" path="out/Debug/lib.java/third_party/android_medi a/android_media_java.jar"/> |
| 275 <classpathentry kind="lib" path="out/Debug/lib.java/third_party/android_prot obuf/protobuf_nano_javalib.jar"/> | 275 <classpathentry kind="lib" path="out/Debug/lib.java/third_party/android_prot obuf/protobuf_nano_javalib.jar"/> |
| 276 <classpathentry kind="lib" path="out/Debug/lib.java/third_party/android_swip e_refresh/android_swipe_refresh_java.jar"/> | 276 <classpathentry kind="lib" path="out/Debug/lib.java/third_party/android_swip e_refresh/android_swipe_refresh_java.jar"/> |
| 277 <classpathentry kind="lib" path="out/Debug/lib.java/third_party/cacheinvalid ation/cacheinvalidation_javalib.jar"/> | 277 <classpathentry kind="lib" path="out/Debug/lib.java/third_party/cacheinvalid ation/cacheinvalidation_javalib.jar"/> |
| 278 <classpathentry kind="lib" path="out/Debug/lib.java/third_party/cacheinvalid ation/cacheinvalidation_proto_java.jar"/> | 278 <classpathentry kind="lib" path="out/Debug/lib.java/third_party/cacheinvalid ation/cacheinvalidation_proto_java.jar"/> |
| 279 <classpathentry kind="lib" path="out/Debug/lib.java/third_party/cardboard-ja va/cardboard-java.jar"/> | 279 <classpathentry kind="lib" path="out/Debug/lib.java/third_party/cardboard-ja va/cardboard-java.jar"/> |
| 280 <classpathentry kind="lib" path="out/Debug/lib.java/third_party/gif_player/g if_player_java.jar"/> | 280 <classpathentry kind="lib" path="out/Debug/lib.java/third_party/gif_player/g if_player_java.jar"/> |
| 281 <classpathentry kind="lib" path="out/Debug/lib.java/third_party/robolectric/ robolectric_java.jar" sourcepath="third_party/robolectric/robolectric/robolectri c/src/main/java"/> | |
| 282 <classpathentry kind="lib" path="out/Debug/lib.java/third_party/robolectric/ robolectric_utils_java.jar" sourcepath="third_party/robolectric/robolectric/robo lectric-utils/src/main/java"/> | |
| 283 <classpathentry kind="lib" path="out/Debug/lib.java/third_party/robolectric/ shadows-core-3.0-21.jar" sourcepath="third_party/robolectric/robolectric/robolec tric-shadows/shadows-core/src/main/java"/> | |
| 281 <classpathentry kind="lib" path="out/Debug/lib.java/third_party/WebKit/publi c/blink_headers_java.jar"/> | 284 <classpathentry kind="lib" path="out/Debug/lib.java/third_party/WebKit/publi c/blink_headers_java.jar"/> |
| 282 <classpathentry kind="lib" path="out/Debug/lib.java/ui/accessibility/ui_acce ssibility_java.jar"/> | 285 <classpathentry kind="lib" path="out/Debug/lib.java/ui/accessibility/ui_acce ssibility_java.jar"/> |
| 283 <classpathentry kind="lib" path="out/Debug/lib.java/ui/android/ui_java.jar"/ > | 286 <classpathentry kind="lib" path="out/Debug/lib.java/ui/android/ui_java.jar"/ > |
| 284 | 287 |
| 285 <!-- {% block additional_entries %} --> | 288 <!-- {% block additional_entries %} --> |
| 286 <!-- When this file is processed as a jinja2 template, additional | 289 <!-- When this file is processed as a jinja2 template, additional |
| 287 <classpathentry> elements will be inserted here. --> | 290 <classpathentry> elements will be inserted here. --> |
| 288 <!-- {% endblock %} --> | 291 <!-- {% endblock %} --> |
| 289 | 292 |
| 290 </classpath> | 293 </classpath> |
| OLD | NEW |