Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(396)

Side by Side Diff: chrome/chrome_installer.gypi

Issue 9302029: Revert 119841 - Implementation of GCAPI reactivation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/installer/gcapi/gcapi.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', 7 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
8 # 'branding_dir' is set in the 'conditions' section at the bottom. 8 # 'branding_dir' is set in the 'conditions' section at the bottom.
9 }, 9 },
10 'conditions': [ 10 'conditions': [
11 ['OS=="win"', { 11 ['OS=="win"', {
12 'targets': [ 12 'targets': [
13 { 13 {
14 'target_name': 'gcapi_dll', 14 'target_name': 'gcapi_dll',
15 'type': 'loadable_module', 15 'type': 'loadable_module',
16 'dependencies': [ 16 'dependencies': [
17 'gcapi_lib',
18 'installer_util', 17 'installer_util',
19 '<(DEPTH)/base/base.gyp:base', 18 '<(DEPTH)/base/base.gyp:base',
20 '<(DEPTH)/google_update/google_update.gyp:google_update', 19 '<(DEPTH)/google_update/google_update.gyp:google_update',
21 ], 20 ],
22 'include_dirs': [ 21 'include_dirs': [
23 '<(DEPTH)', 22 '<(DEPTH)',
24 ], 23 ],
25 'sources': [ 24 'sources': [
25 'installer/gcapi/gcapi.cc',
26 'installer/gcapi/gcapi.def', 26 'installer/gcapi/gcapi.def',
27 'installer/gcapi/gcapi.h',
27 ], 28 ],
28 }, 29 },
29 { 30 {
30 'target_name': 'gcapi_lib', 31 'target_name': 'gcapi_lib',
31 'type': 'static_library', 32 'type': 'static_library',
32 'dependencies': [ 33 'dependencies': [
33 'installer_util', 34 'installer_util',
34 '<(DEPTH)/base/base.gyp:base', 35 '<(DEPTH)/base/base.gyp:base',
35 '<(DEPTH)/google_update/google_update.gyp:google_update', 36 '<(DEPTH)/google_update/google_update.gyp:google_update',
36 ], 37 ],
37 'include_dirs': [ 38 'include_dirs': [
38 '<(DEPTH)', 39 '<(DEPTH)',
39 ], 40 ],
40 'sources': [ 41 'sources': [
41 'installer/gcapi/gcapi.cc', 42 'installer/gcapi/gcapi.cc',
42 'installer/gcapi/gcapi.h', 43 'installer/gcapi/gcapi.h',
43 'installer/gcapi/gcapi_reactivation.cc',
44 'installer/gcapi/gcapi_reactivation.h',
45 ], 44 ],
46 }, 45 },
47 { 46 {
48 'target_name': 'gcapi_test', 47 'target_name': 'gcapi_test',
49 'type': 'executable', 48 'type': 'executable',
50 'dependencies': [ 49 'dependencies': [
51 'common', 50 'common',
52 'gcapi_dll', 51 'gcapi_dll',
53 'gcapi_lib', 52 'gcapi_lib',
54 'installer_util', 53 'installer_util',
55 '<(DEPTH)/base/base.gyp:base', 54 '<(DEPTH)/base/base.gyp:base',
56 '<(DEPTH)/base/base.gyp:test_support_base', 55 '<(DEPTH)/base/base.gyp:test_support_base',
57 '<(DEPTH)/testing/gtest.gyp:gtest', 56 '<(DEPTH)/testing/gtest.gyp:gtest',
58 ], 57 ],
59 'include_dirs': [ 58 'include_dirs': [
60 '<(DEPTH)', 59 '<(DEPTH)',
61 ], 60 ],
62 'sources': [ 61 'sources': [
63 'installer/gcapi/gcapi_last_run_test.cc', 62 'installer/gcapi/gcapi_last_run_test.cc',
64 'installer/gcapi/gcapi_reactivation_test.cc',
65 'installer/gcapi/gcapi_test.cc', 63 'installer/gcapi/gcapi_test.cc',
66 'installer/gcapi/gcapi_test.rc', 64 'installer/gcapi/gcapi_test.rc',
67 'installer/gcapi/resource.h', 65 'installer/gcapi/resource.h',
68 ], 66 ],
69 }, 67 },
70 { 68 {
71 'target_name': 'installer_util_unittests', 69 'target_name': 'installer_util_unittests',
72 'type': 'executable', 70 'type': 'executable',
73 'dependencies': [ 71 'dependencies': [
74 'installer_util', 72 'installer_util',
(...skipping 862 matching lines...) Expand 10 before | Expand all | Expand 10 after
937 'variables': { 935 'variables': {
938 'branding_dir': 'app/theme/google_chrome', 936 'branding_dir': 'app/theme/google_chrome',
939 }, 937 },
940 }, { # else branding!="Chrome" 938 }, { # else branding!="Chrome"
941 'variables': { 939 'variables': {
942 'branding_dir': 'app/theme/chromium', 940 'branding_dir': 'app/theme/chromium',
943 }, 941 },
944 }], 942 }],
945 ], 943 ],
946 } 944 }
OLDNEW
« no previous file with comments | « no previous file | chrome/installer/gcapi/gcapi.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698