diff options
| author | ianwen <ianwen@chromium.org> | 2015-07-10 16:51:02 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-10 23:51:30 +0000 |
| commit | 059d5d826a3803cdb4a18f217503bf6860463b3b (patch) | |
| tree | 9d08b736e7793b636f2cfa8d97731a5c2afbbcbb /build/java.gypi | |
| parent | bee53729a8f430e4a8c92ec8a5bfc82952b50a27 (diff) | |
| download | chromium_src-059d5d826a3803cdb4a18f217503bf6860463b3b.zip chromium_src-059d5d826a3803cdb4a18f217503bf6860463b3b.tar.gz chromium_src-059d5d826a3803cdb4a18f217503bf6860463b3b.tar.bz2 | |
Expose custom tab client gyp target in chromium
A custom tab client project has been mirrored in third_party. We
should add a gyp target to compile it in upstream, and delete the
downstream one.
This CL also updated java.gypi to let it take customizable
src suffix, just like java_apk.gypi.
BUG=NONE
Review URL: https://codereview.chromium.org/1222403005
Cr-Commit-Position: refs/heads/master@{#338399}
Diffstat (limited to 'build/java.gypi')
| -rw-r--r-- | build/java.gypi | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/build/java.gypi b/build/java.gypi index facac98..73c550d 100644 --- a/build/java.gypi +++ b/build/java.gypi @@ -79,6 +79,7 @@ 'never_lint%': 0, 'findbugs_stamp': '<(intermediate_dir)/findbugs.stamp', 'run_findbugs%': 0, + 'java_in_dir_suffix%': '/src', 'proguard_config%': '', 'proguard_preprocess%': '0', 'enable_errorprone%': '0', @@ -259,7 +260,7 @@ 'variables': { 'extra_args': [], 'extra_inputs': [], - 'java_sources': ['>!@(find >(java_in_dir)/src >(additional_src_dirs) -name "*.java")'], + 'java_sources': ['>!@(find >(java_in_dir)>(java_in_dir_suffix) >(additional_src_dirs) -name "*.java")'], 'conditions': [ ['enable_errorprone == 1', { 'extra_inputs': [ @@ -315,7 +316,7 @@ { 'variables': { 'src_dirs': [ - '<(java_in_dir)/src', + '<(java_in_dir)<(java_in_dir_suffix)', '>@(additional_src_dirs)', ], 'stamp_path': '<(lint_stamp)', |