From 2f7c5984b86186dedeb17d551b9159df0462a8b5 Mon Sep 17 00:00:00 2001 From: newt Date: Thu, 18 Jun 2015 21:24:55 -0700 Subject: 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} --- chrome/android/chrome_apk.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chrome/android/chrome_apk.gyp') 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)', -- cgit v1.1