diff options
author | nyquist@chromium.org <nyquist@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-14 01:23:40 +0000 |
---|---|---|
committer | nyquist@chromium.org <nyquist@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-14 01:23:40 +0000 |
commit | 8b39347a55356fc4c30e48d350abc39b8aad79b9 (patch) | |
tree | f86222d91eb02170b6f22a4eeaf2d473cc8e2ead /build | |
parent | 8685432924dc4a2ff291f9faa53af7b35d7391bb (diff) | |
download | chromium_src-8b39347a55356fc4c30e48d350abc39b8aad79b9.zip chromium_src-8b39347a55356fc4c30e48d350abc39b8aad79b9.tar.gz chromium_src-8b39347a55356fc4c30e48d350abc39b8aad79b9.tar.bz2 |
Check in protobuf java code and generate lite jar.
Since we only need the lite version of protobuf, we generate a jar file based
on includes in the maven pom.xml file for the lite profile.
BUG=158382
Review URL: https://chromiumcodereview.appspot.com/11347026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167557 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r-- | build/android/ant/chromium-jars.xml | 8 | ||||
-rw-r--r-- | build/java.gypi | 6 |
2 files changed, 14 insertions, 0 deletions
diff --git a/build/android/ant/chromium-jars.xml b/build/android/ant/chromium-jars.xml index 7007df5..07110cf 100644 --- a/build/android/ant/chromium-jars.xml +++ b/build/android/ant/chromium-jars.xml @@ -38,6 +38,12 @@ check-exists="false" /> + <condition property="javac_includes_message" + value="" + else="Include filter: ${JAVAC_INCLUDES}"> + <equals arg1="${JAVAC_INCLUDES}" arg2=""/> + </condition> + <target name="init"> <!-- Create the time stamp --> <tstamp/> @@ -64,6 +70,7 @@ <echo> Compiling ${javac.srcdir}, classpath: ${toString:javac.custom.classpath} + ${javac_includes_message} </echo> <javac @@ -72,6 +79,7 @@ classpathref="javac.custom.classpath" debug="true" includeantruntime="false" + includes="${JAVAC_INCLUDES}" /> </target> diff --git a/build/java.gypi b/build/java.gypi index 56af2e1..0f180b2 100644 --- a/build/java.gypi +++ b/build/java.gypi @@ -34,6 +34,10 @@ # included in the 'inputs' list (unlike additional_src_dirs). # input_jars_paths - The path to jars to be included in the classpath. This # should be filled automatically by depending on the appropriate targets. +# include_files - A list of specific files to include. This is by default +# empty, which leads to inclusion of all files specified. May include +# wildcard, and supports '**/' for recursive path wildcards, ie.: +# '**/MyFileRegardlessOfDirectory.java', '**/IncludedPrefix*.java'. { 'dependencies': [ @@ -51,6 +55,7 @@ 'additional_src_dirs': [], 'additional_input_paths': [], 'generated_src_dirs': [], + 'javac_includes': [], }, 'actions': [ { @@ -80,6 +85,7 @@ '-DGENERATED_SRC_DIRS=>(generated_src_dirs)', '-DINPUT_JARS_PATHS=>(input_jars_paths)', '-DPACKAGE_NAME=<(package_name)', + '-DJAVAC_INCLUDES=>(javac_includes)', '-Dbasedir=<(java_in_dir)', '-buildfile', |