diff options
| author | Dave Borowitz <dborowitz@google.com> | 2015-12-01 14:02:40 -0500 |
|---|---|---|
| committer | Dave Borowitz <dborowitz@google.com> | 2015-12-03 10:27:38 -0500 |
| commit | dbe169820deca694184f27bd0c01ea4f3d5e1c49 (patch) | |
| tree | f7f01ed206086d4e179d614cc0e2a804682d0665 | |
| parent | c8c61f594fd7004c62ef14649913161c1d6d1da8 (diff) | |
Eclipse: List GWT deps after non-GWT deps
The stated purpose of separating libs and gwt_libs is to avoid
incorrect versions of classes used elsewhere in Gerrit (e.g. servlet
API 3.0 instead of 3.1). But we were iterating through gwt_libs first,
so this wasn't actually working. Swap the order.
Also change the prefix check for GWT deps to a contains check, as buck
audit at some point started returning absolute paths to jars.
Change-Id: Ic372b6bfaca5a8a1c1b9cc32aaf868a86a91c6ef
| -rwxr-xr-x | tools/eclipse/project.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/eclipse/project.py b/tools/eclipse/project.py index 67ab138a5d..754c1c892e 100755 --- a/tools/eclipse/project.py +++ b/tools/eclipse/project.py @@ -119,7 +119,7 @@ def gen_classpath(): gwt_lib.add(p) continue - if p.startswith('buck-out/gen/lib/gwt/'): + if 'buck-out/gen/lib/gwt/' in p: # gwt_module() depends on huge shaded GWT JARs that import # incorrect versions of classes for Gerrit. Collect into # a private grouping for later use. @@ -165,7 +165,7 @@ def gen_classpath(): if path.exists(p): classpathentry('src', p, out=o) - for libs in [gwt_lib, lib]: + for libs in [lib, gwt_lib]: for j in sorted(libs): s = None if j.endswith('.jar'): |