diff options
| author | dpranke <dpranke@chromium.org> | 2015-04-16 17:35:13 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-17 00:35:37 +0000 |
| commit | 49d4d4d45b373b0d43514e6769f870c2a3b77099 (patch) | |
| tree | 3bf703381129094f5f3fac2d8e29d60374f00961 /components/BUILD.gn | |
| parent | a87a30b7582cfe871801bbbfd156f6436e675e33 (diff) | |
| download | chromium_src-49d4d4d45b373b0d43514e6769f870c2a3b77099.zip chromium_src-49d4d4d45b373b0d43514e6769f870c2a3b77099.tar.gz chromium_src-49d4d4d45b373b0d43514e6769f870c2a3b77099.tar.bz2 | |
Make the Android GN debug component build actually build.
Changes required:
- fold //base/third_party/nspr/prtime.cc into base
- fixed a compile error causing issues in media_blink_unittests
- fixed various missing dependencies
- disabled chrome_sync_shell_test_apk which needs some more work
Note that this does not mean that things run. I expect they don't :).
R=cjhopman@chromium.org
BUG=359249
Review URL: https://codereview.chromium.org/1089143002
Cr-Commit-Position: refs/heads/master@{#325568}
Diffstat (limited to 'components/BUILD.gn')
| -rw-r--r-- | components/BUILD.gn | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/components/BUILD.gn b/components/BUILD.gn index 93aa824..5873d65 100644 --- a/components/BUILD.gn +++ b/components/BUILD.gn @@ -76,8 +76,6 @@ group("all_components") { "//components/precache/core", "//components/precache/content", "//components/pref_registry", - "//components/proximity_auth", - "//components/proximity_auth/cryptauth", "//components/query_parser", "//components/rappor", "//components/renderer_context_menu", @@ -118,6 +116,13 @@ group("all_components") { "//components/wifi_sync", ] + if (!is_android && !is_ios) { + deps += [ + "//components/proximity_auth", + "//components/proximity_auth/cryptauth", + ] + } + if (!enable_configuration_policy) { deps -= [ "//components/policy" ] } @@ -261,7 +266,6 @@ test("components_unittests") { "//components/omnibox:unit_tests", "//components/ownership:unit_tests", "//components/packed_ct_ev_whitelist:unit_tests", - "//components/proximity_auth:unit_tests", "//components/update_client:unit_tests", "//components/variations:unit_tests", "//components/web_resource:unit_tests", @@ -275,6 +279,10 @@ test("components_unittests") { ] data_deps = [ ":components_tests_pak" ] + if (!is_android && !is_ios) { + deps += [ "//components/proximity_auth:unit_tests" ] + } + # TODO(GYP) need this target. #'breakpad/app/crash_keys_win_unittest.cc', |