Commit e5e5dc78 authored by kkimlabs's avatar kkimlabs Committed by Commit bot

[Android] Add option to skip v14 resource verification to GN.

Added to GYP recently https://codereview.chromium.org/1136953009 .
Adding the same flag to GN.

Also update android_tools' BUILD.gn to use v14_skip

BUG=487391

Review URL: https://codereview.chromium.org/1147483002

Cr-Commit-Position: refs/heads/master@{#330199}
parent edafbf46
...@@ -1104,6 +1104,10 @@ template("process_resources") { ...@@ -1104,6 +1104,10 @@ template("process_resources") {
args += [ "--v14-verify-only" ] args += [ "--v14-verify-only" ]
} }
if (defined(invoker.v14_skip) && invoker.v14_skip) {
args += [ "--v14-skip" ]
}
if (defined(invoker.shared_resources) && invoker.shared_resources) { if (defined(invoker.shared_resources) && invoker.shared_resources) {
args += [ "--shared-resources" ] args += [ "--shared-resources" ]
} }
......
...@@ -583,6 +583,10 @@ template("android_resources") { ...@@ -583,6 +583,10 @@ template("android_resources") {
v14_verify_only = invoker.v14_verify_only v14_verify_only = invoker.v14_verify_only
} }
if (defined(invoker.v14_skip)) {
v14_skip = invoker.v14_skip
}
if (defined(invoker.shared_resources)) { if (defined(invoker.shared_resources)) {
shared_resources = invoker.shared_resources shared_resources = invoker.shared_resources
} }
......
...@@ -34,7 +34,7 @@ android_java_prebuilt("android_support_v13_java") { ...@@ -34,7 +34,7 @@ android_java_prebuilt("android_support_v13_java") {
} }
android_resources("android_support_v7_appcompat_resources") { android_resources("android_support_v7_appcompat_resources") {
v14_verify_only = true v14_skip = true
resource_dirs = resource_dirs =
[ "$android_sdk_root/extras/android/support/v7/appcompat/res" ] [ "$android_sdk_root/extras/android/support/v7/appcompat/res" ]
custom_package = "android.support.v7.appcompat" custom_package = "android.support.v7.appcompat"
...@@ -48,7 +48,7 @@ android_java_prebuilt("android_support_v7_appcompat_java") { ...@@ -48,7 +48,7 @@ android_java_prebuilt("android_support_v7_appcompat_java") {
} }
android_resources("android_support_v7_mediarouter_resources") { android_resources("android_support_v7_mediarouter_resources") {
v14_verify_only = true v14_skip = true
resource_dirs = resource_dirs =
[ "$android_sdk_root/extras/android/support/v7/mediarouter/res" ] [ "$android_sdk_root/extras/android/support/v7/mediarouter/res" ]
deps = [ deps = [
...@@ -73,7 +73,7 @@ android_java_prebuilt("android_support_v7_recyclerview_java") { ...@@ -73,7 +73,7 @@ android_java_prebuilt("android_support_v7_recyclerview_java") {
} }
android_resources("google_play_services_default_resources") { android_resources("google_play_services_default_resources") {
v14_verify_only = true v14_skip = true
resource_dirs = [ "$android_sdk_root/extras/google/google_play_services/libproject/google-play-services_lib/res" ] resource_dirs = [ "$android_sdk_root/extras/google/google_play_services/libproject/google-play-services_lib/res" ]
custom_package = "com.google.android.gms" custom_package = "com.google.android.gms"
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment