Fix eclipse project generation
In Ibe62917e20 maven jar merging using python was replaced with java_binary rule. Fix eclipse project generation and also clean up left over unused import statement and script. Change-Id: I46b14f8e8e380f38962937be253fb1b7e4fa147d
This commit is contained in:
@@ -1,5 +1,4 @@
|
|||||||
load("@rules_java//java:defs.bzl", "java_binary", "java_import", "java_library")
|
load("@rules_java//java:defs.bzl", "java_binary", "java_import", "java_library")
|
||||||
load("//tools/bzl:maven.bzl", "merge_maven_jars")
|
|
||||||
|
|
||||||
package(default_visibility = ["//visibility:public"])
|
package(default_visibility = ["//visibility:public"])
|
||||||
|
|
||||||
|
@@ -1,34 +0,0 @@
|
|||||||
# Copyright (C) 2016 The Android Open Source Project
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
# Merge maven files
|
|
||||||
|
|
||||||
load("@rules_java//java:defs.bzl", "java_import")
|
|
||||||
|
|
||||||
def cmd(jars):
|
|
||||||
return ("$(location //tools:merge_jars) $@ " +
|
|
||||||
" ".join(["$(location %s)" % j for j in jars]))
|
|
||||||
|
|
||||||
def merge_maven_jars(name, srcs, **kwargs):
|
|
||||||
native.genrule(
|
|
||||||
name = "%s__merged_bin" % name,
|
|
||||||
cmd = cmd(srcs),
|
|
||||||
tools = srcs + ["//tools:merge_jars"],
|
|
||||||
outs = ["%s__merged.jar" % name],
|
|
||||||
)
|
|
||||||
java_import(
|
|
||||||
name = name,
|
|
||||||
jars = [":%s__merged_bin" % name],
|
|
||||||
**kwargs
|
|
||||||
)
|
|
@@ -223,7 +223,7 @@ def gen_classpath(ext):
|
|||||||
if p.endswith('libquery_parser.jar') or \
|
if p.endswith('libquery_parser.jar') or \
|
||||||
p.endswith('libgerrit-prolog-common.jar') or \
|
p.endswith('libgerrit-prolog-common.jar') or \
|
||||||
p.endswith('com_google_protobuf/libprotobuf_java.jar') or \
|
p.endswith('com_google_protobuf/libprotobuf_java.jar') or \
|
||||||
p.endswith('lucene-core-and-backward-codecs__merged.jar'):
|
p.endswith('lucene-core-and-backward-codecs-merged_deploy.jar'):
|
||||||
lib.add(p)
|
lib.add(p)
|
||||||
# JGit dependency from external repository
|
# JGit dependency from external repository
|
||||||
if 'gerrit-' not in p and 'jgit' in p:
|
if 'gerrit-' not in p and 'jgit' in p:
|
||||||
|
Reference in New Issue
Block a user