diff options
| author | newt <newt@chromium.org> | 2015-06-18 21:24:55 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-19 04:25:39 +0000 |
| commit | 2f7c5984b86186dedeb17d551b9159df0462a8b5 (patch) | |
| tree | f0d7b11a4828488d39ed176d0fb64b41c320aa1f /chrome/android/chrome_apk.gyp | |
| parent | b49aafb7e5a58579a3ce0b3c7b37a60aebef8c55 (diff) | |
| download | chromium_src-2f7c5984b86186dedeb17d551b9159df0462a8b5.zip chromium_src-2f7c5984b86186dedeb17d551b9159df0462a8b5.tar.gz chromium_src-2f7c5984b86186dedeb17d551b9159df0462a8b5.tar.bz2 | |
Move AndroidManifest.xml from java_staging to java.
This leaves a copy of AndroidManifest.xml in java_staging, which will be
removed once downstream targets are updated.
BUG=501140
Review URL: https://codereview.chromium.org/1190183004
Cr-Commit-Position: refs/heads/master@{#335206}
Diffstat (limited to 'chrome/android/chrome_apk.gyp')
| -rw-r--r-- | chrome/android/chrome_apk.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/android/chrome_apk.gyp b/chrome/android/chrome_apk.gyp index 239236d..87078c9 100644 --- a/chrome/android/chrome_apk.gyp +++ b/chrome/android/chrome_apk.gyp @@ -270,7 +270,7 @@ 'target_name': 'chrome_public_manifest', 'type': 'none', 'variables': { - 'jinja_inputs': ['<(chrome_java_dir)/AndroidManifest.xml'], + 'jinja_inputs': ['java/AndroidManifest.xml'], 'jinja_output': '<(chrome_public_apk_manifest)', 'jinja_variables': [ 'channel=<(android_channel)', |