mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-27 12:15:33 +00:00
c8ee8a09cf
This commit is us getting out of our own way. We were specifying
-classpath twice, once in $(JAVAC) and once in java-build.mk. Only
the latter of these is active. This a problem for ANDROID_EXTRA_JARS
-- those JARs should be on the classpath and input to $(DX) -- and
JARs that should be on the classpath but *not* input to $(DX). This
commit removes the global flags to $(JAVAC) and adds
JAVA_{BOOT}CLASSPATH_JARS. This required some hijinkery moving
wildcards to moz.build files, but everything seems to work.
As well as clarifying some parts of the build, part 2 uses this work
to modify the classpath.
--HG--
extra : commitid : 25Ft0BFs88O
extra : rebase_source : 05e3d1da8d42fa89d06ef48baee17bb77df5bd59
extra : histedit_source : 95b82309aca15c5a3c5f5a0eafbdcf75c5e8dfc0
25 lines
909 B
Python
25 lines
909 B
Python
# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
|
|
# vim: set filetype=python:
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
|
|
jar = add_java_jar('annotationProcessors')
|
|
jar.sources += [
|
|
'AnnotationInfo.java',
|
|
'AnnotationProcessor.java',
|
|
'classloader/AnnotatableEntity.java',
|
|
'classloader/ClassWithOptions.java',
|
|
'classloader/IterableJarLoadingURLClassLoader.java',
|
|
'classloader/JarClassIterator.java',
|
|
'CodeGenerator.java',
|
|
'SDKProcessor.java',
|
|
'utils/AlphabeticAnnotatableEntityComparator.java',
|
|
'utils/GeneratableElementIterator.java',
|
|
'utils/Utils.java',
|
|
]
|
|
jar.extra_jars += [
|
|
CONFIG['ANDROID_TOOLS'] + '/lib/lint.jar',
|
|
CONFIG['ANDROID_TOOLS'] + '/lib/lint-checks.jar',
|
|
]
|