diff options
author | nyquist <nyquist@chromium.org> | 2015-09-09 20:38:52 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-09-10 03:39:26 +0000 |
commit | 6aeec514d33506a479fac1e5e1c7fe49927b5f81 (patch) | |
tree | 5d2f823484976f540ccef0258e98af6f78fde421 /BUILD.gn | |
parent | b737a0d4277145e51fe0081ac049bfe27ac61f1e (diff) | |
download | chromium_src-6aeec514d33506a479fac1e5e1c7fe49927b5f81.zip chromium_src-6aeec514d33506a479fac1e5e1c7fe49927b5f81.tar.gz chromium_src-6aeec514d33506a479fac1e5e1c7fe49927b5f81.tar.bz2 |
Make blimp/common:blimp_common compile for Linux.
In addition to the compilation fix, it fixes the following GN issues:
- Moves blimp_apk from 'both_gn_and_gyp' group to 'gn_only'.
- Adds a top-level blimp GN group.
- Ensures //blimp is built on linux.
BUG=None
Review URL: https://codereview.chromium.org/1329323002
Cr-Commit-Position: refs/heads/master@{#348086}
Diffstat (limited to 'BUILD.gn')
-rw-r--r-- | BUILD.gn | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -216,7 +216,6 @@ group("both_gn_and_gyp") { if (is_android) { deps += [ "//base/android/linker:chromium_android_linker", - "//blimp/client:blimp_apk", "//build/android/gyp/test:hello_world", "//build/android/rezip", "//chrome/android:chrome_public_apk", @@ -617,6 +616,7 @@ group("gn_only") { # and figure out how cross-platform they are deps += [ ":gn_mojo_targets", + "//blimp", "//chrome/browser/resources:extension_resource_demo", "//chrome/installer/util:strings", "//chrome:main_dll", @@ -700,6 +700,10 @@ group("gn_only") { } } + if (is_android) { + deps += [ "//blimp/client:blimp_apk" ] + } + if (is_mac) { deps -= [ "//mandoline:all" ] # TODO(GYP) } |