diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-20 10:33:36 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-22 11:45:12 +0000 |
commit | be59a35641616a4cf23c4a13fa0632624b021c1b (patch) | |
tree | 9da183258bdf9cc413f7562079d25ace6955467f /chromium/chromecast/base | |
parent | d702e4b6a64574e97fc7df8fe3238cde70242080 (diff) | |
download | qtwebengine-chromium-be59a35641616a4cf23c4a13fa0632624b021c1b.tar.gz |
BASELINE: Update Chromium to 62.0.3202.101
Change-Id: I2d5eca8117600df6d331f6166ab24d943d9814ac
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/chromecast/base')
-rw-r--r-- | chromium/chromecast/base/BUILD.gn | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/chromium/chromecast/base/BUILD.gn b/chromium/chromecast/base/BUILD.gn index 34f9b6f02d5..20a21739153 100644 --- a/chromium/chromecast/base/BUILD.gn +++ b/chromium/chromecast/base/BUILD.gn @@ -13,7 +13,9 @@ if (is_android) { declare_args() { # Denotes the type of Cast product. This is #defined as CAST_PRODUCT_TYPE in # version.h. See //components/metrics/proto/cast_logs.proto for valid values. - if (is_android) { + if (is_android_arc) { + cast_product_type = 7 # CAST_PRODUCT_TYPE_CHROME_OS + } else if (is_android) { if (is_android_things) { cast_product_type = 6 # CAST_PRODUCT_TYPE_ANDROID_THINGS } else { @@ -24,11 +26,14 @@ declare_args() { } } -if (is_android) { +if (is_android_arc) { + assert(cast_product_type == 7) +} else if (is_android) { assert(cast_product_type == 4 || cast_product_type == 6) } else { - assert(cast_product_type >= 0 && cast_product_type <= 6 && - cast_product_type != 4 && cast_product_type != 6) + assert(cast_product_type >= 0 && cast_product_type <= 7 && + cast_product_type != 4 && cast_product_type != 6 && + cast_product_type != 7) } source_set("base") { |