Permalink
Browse files

Use system-installed jsr305.jar for Android build.

We need to get rid of dependency on SVN from DEPS file because
gclient command is going to drop SVN support.

With this CL, either jsr305.jar or jsr-305.jar will be picked up from
/usr/share/java so that we can remove dependency on the SVN repository
hosted at findbugs.googlecode.com.

No user-visible change is intended.

BUG=#299
TEST=compile
REF_BUG=23909405
REF_CL=102077935,103069068
  • Loading branch information...
1 parent 8a53a39 commit 0f4b21b0ad19922afcdb282814feec53f32cbc1e @yukawa yukawa committed Sep 19, 2015
View
@@ -36,7 +36,6 @@ vars = {
"jsoncpp_revision": "11086dd6a7eba04289944367ca82cea71299ed70",
"protobuf_revision": "172019c40bf548908ab09bfd276074c929d48415",
"zinnia_revision": "16",
- "jsr305_version": "2.0.2",
"zlib_revision": "50893291621658f355bc5b4d450a8d06a563053d",
"japanese_usage_dictionary_revision": "e5b3425575734c323e1d947009dd74709437b684",
}
@@ -73,12 +72,6 @@ deps_os = {
Var("zinnia_revision"),
},
"unix": {
- "src/third_party/findbug":
- # We need only a jar file so avoiding to sync entire tree.
- # Findbug project keeps release-jar files in their repository.
- File("http://findbugs.googlecode.com/"
- + "svn/repos/release-repository/com/google/code/findbugs/jsr305/"
- + Var("jsr305_version") + "/jsr305-" + Var("jsr305_version") + ".jar"),
"src/third_party/fontTools":
"https://github.com/googlei18n/fonttools.git@" +
Var("fonttools_revision"),
@@ -71,7 +71,10 @@
'easymock_src_path': '<(DEPTH)/third_party/easymock/src/main/java',
'guava_jar_path': '<(DEPTH)/third_party/guava/guava-jdk5-13.0.jar',
'guava_testlib_jar_path': '<(DEPTH)/third_party/guava/guava-testlib-jdk5-13.0.jar',
- 'jsr305_jar_path': '<(DEPTH)/third_party/findbug/jsr305-2.0.2.jar',
+ # Absorb the difference in file names between Debian/Ubuntu (jsr305.jar)
+ # and Fedora (jsr-305.jar).
+ # TODO(yukawa): We should not rely on "find" command here.
+ 'jsr305_jar_path': '<!(find /usr/share/java -name "jsr305.jar" -o -name "jsr-305.jar")',
'dictionary_data': '<(shared_intermediate_mozc_dir)/data_manager/oss/system.dictionary',
'connection_data': '<(shared_intermediate_mozc_dir)/data_manager/oss/connection_data.data',
'connection_text_data': '<(shared_intermediate_mozc_dir)/data_manager/oss/connection_single_column.txt',
@@ -36,7 +36,7 @@ RUN yum install -y clang libstdc++-static python subversion git curl bzip2 unzip
## Packages for linux desktop version
RUN yum install -y ibus-devel glib2-devel qt-devel zinnia-devel zinnia-tomoe-ja gtk2-devel libxcb-devel
## Packages for Android
-RUN yum install -y java-1.7.0-openjdk-devel ant glibc.i686 glibc-devel.i686 libstdc++.i686 ncurses-devel.i686 zlib-devel.i686 zip
+RUN yum install -y java-1.7.0-openjdk-devel jsr-305 ant glibc.i686 glibc-devel.i686 libstdc++.i686 ncurses-devel.i686 zlib-devel.i686 zip
## For emacsian
RUN yum install -y emacs
@@ -39,7 +39,7 @@ RUN apt install -y clang python pkg-config subversion git curl bzip2 unzip make
## Packages for linux desktop version
RUN apt install -y libibus-1.0-dev libdbus-1-dev libglib2.0-dev subversion libqt4-dev libzinnia-dev tegaki-zinnia-japanese libgtk2.0-dev libxcb-xfixes0-dev
## Packages for Android
-RUN apt install -y --no-install-recommends openjdk-7-jdk openjdk-7-jre-headless ant libc6:i386 libstdc++6:i386 libncurses5:i386 zlib1g:i386 zip
+RUN apt install -y --no-install-recommends openjdk-7-jdk openjdk-7-jre-headless libjsr305-java ant libc6:i386 libstdc++6:i386 libncurses5:i386 zlib1g:i386 zip
## Packages for NaCl
RUN apt install -y libc6:i386 libstdc++6:i386
## For emacsian
@@ -1,6 +1,6 @@
MAJOR=2
MINOR=17
-BUILD=2120
+BUILD=2121
REVISION=102
# NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
# downloaded by NaCl Mozc.

0 comments on commit 0f4b21b

Please sign in to comment.