diff options
| author | kkimlabs <kkimlabs@chromium.org> | 2015-05-15 14:13:41 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-15 21:14:25 +0000 |
| commit | e5e5dc785e37e50dafea030349ffdd534d2231e3 (patch) | |
| tree | a2f8a13bfc2f83528c0c36adf5fc1d58feeef55c | |
| parent | edafbf4613c91c45d49ceb35db3fd23205bf8fc0 (diff) | |
| download | chromium_src-e5e5dc785e37e50dafea030349ffdd534d2231e3.zip chromium_src-e5e5dc785e37e50dafea030349ffdd534d2231e3.tar.gz chromium_src-e5e5dc785e37e50dafea030349ffdd534d2231e3.tar.bz2 | |
[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}
| -rw-r--r-- | build/config/android/internal_rules.gni | 4 | ||||
| -rw-r--r-- | build/config/android/rules.gni | 4 | ||||
| -rw-r--r-- | build/secondary/third_party/android_tools/BUILD.gn | 6 |
3 files changed, 11 insertions, 3 deletions
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni index 795e0dd..a5a1235 100644 --- a/build/config/android/internal_rules.gni +++ b/build/config/android/internal_rules.gni @@ -1104,6 +1104,10 @@ template("process_resources") { args += [ "--v14-verify-only" ] } + if (defined(invoker.v14_skip) && invoker.v14_skip) { + args += [ "--v14-skip" ] + } + if (defined(invoker.shared_resources) && invoker.shared_resources) { args += [ "--shared-resources" ] } diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni index 0b7593d..6140b5e 100644 --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni @@ -583,6 +583,10 @@ template("android_resources") { v14_verify_only = invoker.v14_verify_only } + if (defined(invoker.v14_skip)) { + v14_skip = invoker.v14_skip + } + if (defined(invoker.shared_resources)) { shared_resources = invoker.shared_resources } diff --git a/build/secondary/third_party/android_tools/BUILD.gn b/build/secondary/third_party/android_tools/BUILD.gn index 099b892..f054125 100644 --- a/build/secondary/third_party/android_tools/BUILD.gn +++ b/build/secondary/third_party/android_tools/BUILD.gn @@ -34,7 +34,7 @@ android_java_prebuilt("android_support_v13_java") { } android_resources("android_support_v7_appcompat_resources") { - v14_verify_only = true + v14_skip = true resource_dirs = [ "$android_sdk_root/extras/android/support/v7/appcompat/res" ] custom_package = "android.support.v7.appcompat" @@ -48,7 +48,7 @@ android_java_prebuilt("android_support_v7_appcompat_java") { } android_resources("android_support_v7_mediarouter_resources") { - v14_verify_only = true + v14_skip = true resource_dirs = [ "$android_sdk_root/extras/android/support/v7/mediarouter/res" ] deps = [ @@ -73,7 +73,7 @@ android_java_prebuilt("android_support_v7_recyclerview_java") { } 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" ] custom_package = "com.google.android.gms" } |