Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2591)

Unified Diff: android_webview/BUILD.gn

Issue 2315993003: Reland of GN(Android): Stop specifying depfile under outputs (Closed)
Patch Set: Create depfile parent directory when it doesn't exist Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/android/gyp/util/build_utils.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/BUILD.gn
diff --git a/android_webview/BUILD.gn b/android_webview/BUILD.gn
index d97c3d6c6048df6ba0f0dccfa86426cb021704ab..5927a3c122b44c07540ea995ed4cbba90625556d 100644
--- a/android_webview/BUILD.gn
+++ b/android_webview/BUILD.gn
@@ -18,6 +18,9 @@ if (!defined(use_webview_internal_framework)) {
use_webview_internal_framework = false
}
+system_webview_android_manifest =
+ "$target_gen_dir/system_webview_apk/AndroidManifest.xml"
+
group("android_webview") {
if (!use_webview_internal_framework) {
deps = [
@@ -28,7 +31,7 @@ group("android_webview") {
jinja_template("system_webview_manifest") {
input = "apk/java/AndroidManifest.xml"
- output = "$target_gen_dir/system_webview_manifest/AndroidManifest.xml"
+ output = system_webview_android_manifest
variables = [ "package=$system_webview_package_name" ]
}
@@ -784,8 +787,7 @@ java_strings_grd("strings_grd") {
if (!use_webview_internal_framework) {
system_webview_apk_tmpl("system_webview_apk") {
- android_manifest = get_target_outputs(":system_webview_manifest")
- android_manifest = android_manifest[1]
+ android_manifest = system_webview_android_manifest
android_manifest_dep = ":system_webview_manifest"
deps = [
":system_webview_resources",
« no previous file with comments | « no previous file | build/android/gyp/util/build_utils.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698