diff options
| author | Brett Wilson <brettw@chromium.org> | 2014-08-25 12:10:01 -0700 |
|---|---|---|
| committer | Brett Wilson <brettw@chromium.org> | 2014-08-25 19:11:32 +0000 |
| commit | 1c693998d75f78e94862c324afba3815356ecaf1 (patch) | |
| tree | e9eeb250ded43e757513a21fe3c92ada154c6b1b /google_apis | |
| parent | 8fbaaa3b0cde0b4a96ef105814e76b3d9ab0d430 (diff) | |
| download | chromium_src-1c693998d75f78e94862c324afba3815356ecaf1.zip chromium_src-1c693998d75f78e94862c324afba3815356ecaf1.tar.gz chromium_src-1c693998d75f78e94862c324afba3815356ecaf1.tar.bz2 | |
Add some remoting targets to GN build.
Since GN runs its scripts in a different current directory than GYP, I had to update the remoting html template script to be able to handle this situation.
Also includes many misc linking fixes:
- Sets enable_nacl to false.
- Add renderer context menu component
- Adds many missing files
R=sergeyu@chromium.org
Review URL: https://codereview.chromium.org/498773005
Cr-Commit-Position: refs/heads/master@{#291731}
Diffstat (limited to 'google_apis')
| -rw-r--r-- | google_apis/BUILD.gn | 2 | ||||
| -rw-r--r-- | google_apis/google_apis.gyp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/google_apis/BUILD.gn b/google_apis/BUILD.gn index 582d34a..90ca8ff 100644 --- a/google_apis/BUILD.gn +++ b/google_apis/BUILD.gn @@ -77,6 +77,8 @@ config("key_defines") { source_set("google_apis") { sources = [ + "gaia/account_tracker.cc", + "gaia/account_tracker.h", "gaia/gaia_auth_consumer.cc", "gaia/gaia_auth_consumer.h", "gaia/gaia_auth_fetcher.cc", diff --git a/google_apis/google_apis.gyp b/google_apis/google_apis.gyp index 918097e..0ad8165 100644 --- a/google_apis/google_apis.gyp +++ b/google_apis/google_apis.gyp @@ -39,6 +39,7 @@ }], ['enable_extensions==1', { 'sources': [ + # Note: sources list duplicated in GN build. 'drive/auth_service.cc', 'drive/auth_service.h', 'drive/auth_service_interface.h', @@ -72,6 +73,7 @@ }], ], 'sources': [ + # Note: sources list duplicated in GN build. 'gaia/account_tracker.cc', 'gaia/account_tracker.h', 'gaia/gaia_auth_consumer.cc', |