diff options
| author | Newton Allen <newt@chromium.org> | 2015-06-24 14:41:53 -0700 |
|---|---|---|
| committer | Newton Allen <newt@chromium.org> | 2015-06-24 21:44:08 +0000 |
| commit | 38c622123327d05f2dc10d7a1797aa25b6ad313d (patch) | |
| tree | 5ea531bb941511266d7c13ae145d61e1e08e3fe8 /WATCHLISTS | |
| parent | 43ff1e72eb75edd3ff1abdd5e106970f92baa2a0 (diff) | |
| download | chromium_src-38c622123327d05f2dc10d7a1797aa25b6ad313d.zip chromium_src-38c622123327d05f2dc10d7a1797aa25b6ad313d.tar.gz chromium_src-38c622123327d05f2dc10d7a1797aa25b6ad313d.tar.bz2 | |
Merge java_staging/src into java/src.
This moves all the java files in chrome/android/java_staging to
chrome/android/java, and merges the chrome_staging_java build target
into chrome_java.
Files moved using using:
cd chrome/android/java_staging
for src in $(find . -type f); do
dst=../java/$src
mkdir -p $(dirname $dst)
mv $src $dst
done
BUG=501140
R=cjhopman@chromium.org, mnaganov@chromium.org, tedchoc@chromium.org, yfriedman@chromium.org
TBR=sky@chromium.org
Review URL: https://codereview.chromium.org/1206673003.
Cr-Commit-Position: refs/heads/master@{#336008}
Diffstat (limited to 'WATCHLISTS')
| -rw-r--r-- | WATCHLISTS | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -270,7 +270,7 @@ 'chrome/common/custom_handlers/', }, 'custom_tabs': { - 'filepath': 'chrome/android/java_staging/src/org/chromium/chrome/browser/customtabs/|'\ + 'filepath': 'chrome/android/java/src/org/chromium/chrome/browser/customtabs/|'\ 'chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/', }, 'deep_memory_profiler': { @@ -338,7 +338,7 @@ '|components/enhanced_bookmarks/' }, 'enhanced_bookmarks_android': { - 'filepath': 'chrome/android/java_staging/src/org/chromium/'\ + 'filepath': 'chrome/android/java/src/org/chromium/'\ 'chrome/browser/enhancedbookmarks/|'\ 'chrome/android/java/res/layout/eb*.xml' }, |