summaryrefslogtreecommitdiffstats
path: root/chrome/android/chrome_apk.gyp
diff options
context:
space:
mode:
authornewt <newt@chromium.org>2015-06-17 14:30:12 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-17 21:30:45 +0000
commit7586ac6e3236a0ca6a798150f02cd33f15bd86bc (patch)
treee9547d42efe5c6c1b92fcb1ab852c955588f981c /chrome/android/chrome_apk.gyp
parent27b328bf38b552b1576c0a0368c00a36be5ec781 (diff)
downloadchromium_src-7586ac6e3236a0ca6a798150f02cd33f15bd86bc.zip
chromium_src-7586ac6e3236a0ca6a798150f02cd33f15bd86bc.tar.gz
chromium_src-7586ac6e3236a0ca6a798150f02cd33f15bd86bc.tar.bz2
Move res_default resources from java_staging to java.
BUG=497470 Review URL: https://codereview.chromium.org/1188143004 Cr-Commit-Position: refs/heads/master@{#334924}
Diffstat (limited to 'chrome/android/chrome_apk.gyp')
-rw-r--r--chrome/android/chrome_apk.gyp3
1 files changed, 0 insertions, 3 deletions
diff --git a/chrome/android/chrome_apk.gyp b/chrome/android/chrome_apk.gyp
index 53b449d..239236d 100644
--- a/chrome/android/chrome_apk.gyp
+++ b/chrome/android/chrome_apk.gyp
@@ -134,9 +134,6 @@
'R_package': 'com.google.android.apps.chrome',
'R_package_relpath': 'com/google/android/apps/chrome',
'has_java_resources': 1,
- 'res_channel_dir': '<(chrome_java_dir)/res_default',
- 'res_extra_dirs': ['<(res_channel_dir)'],
- 'res_extra_files': ['<!@(find <(res_channel_dir) -type f)'],
},
'dependencies': [
'custom_tabs_service_aidl',