|
chrome: create an option for using libcros provided by the system; fix all
includes referring to libcros to not include third_party/
* Headers fix is needed to support using system libcros (installed to /usr/include)
and DEPS include rule updated
* All includes are "", and therefore a local variant in third_party/cros/ is
always preferred, but system will also get picked up as a secondary target
* Fixed chrome/browser/chromeos/cros/synaptics_library.h comments to better
reflect the header placement
* Added a variable system_libcros defaulting to 0
* Gotten rid of duplicate cros_api.gyp
* Changed both places to either link against cros_api or libcrosapi
TEST=build in the following scenarios:
1) libcros not installed, libcros sources in third_party/, !defined system_libcros
- sucess
2) installed libcros, put #error into /usr/include/cros/chromeos_cros_api.h, repeat 1)
- success
3) BUILD_DEFINES+=system_libcros=1, removed libcros from third_party, repeat 2)
- fail (on #error in chromeos_cros_api.h)
4) Installed clean libcros, repeat 3)
- success
Main changes:
M chrome/browser/chromeos/input_method/candidate_window.gyp
M chrome/chrome_browser.gypi
M build/common.gypi
D chrome/browser/chromeos/cros/cros_api.gyp
Header fixes:
M chrome/browser/views/extensions/extension_popup.cc
M chrome/browser/views/browser_bubble_gtk.cc
M chrome/browser/views/info_bubble.cc
M chrome/browser/chromeos/panels/panel_browsertest.cc
M chrome/browser/chromeos/login/background_view.cc
M chrome/browser/chromeos/login/screen_locker.cc
M chrome/browser/chromeos/login/user_controller.cc
M chrome/browser/chromeos/login/wizard_controller.cc
M chrome/browser/chromeos/frame/browser_view.cc
M chrome/browser/chromeos/frame/panel_controller.cc
M chrome/browser/chromeos/options/language_config_model.h
MM chrome/browser/chromeos/wm_overview_title.cc
M chrome/browser/chromeos/input_method/candidate_window.cc
MM chrome/browser/chromeos/wm_overview_fav_icon.cc
M chrome/browser/chromeos/google_update_chromeos.cc
M chrome/browser/chromeos/cros/cros_in_process_browser_test.h
M chrome/browser/chromeos/cros/login_library.h
M chrome/browser/chromeos/cros/update_library.h
M chrome/browser/chromeos/cros/screen_lock_library.h
M chrome/browser/chromeos/cros/cryptohome_library.h
M chrome/browser/chromeos/cros/power_library.h
M chrome/browser/chromeos/cros/input_method_library.h
M chrome/browser/chromeos/cros/keyboard_library.h
M chrome/browser/chromeos/cros/mock_mount_library.h
M chrome/browser/chromeos/cros/synaptics_library.h
M chrome/browser/chromeos/cros/speech_synthesis_library.cc
M chrome/browser/chromeos/cros/system_library.h
M chrome/browser/chromeos/cros/network_library.h
M chrome/browser/chromeos/cros/cros_library_loader.cc
M chrome/browser/chromeos/cros/keyboard_library.cc
M chrome/browser/chromeos/cros/mount_library.h
M chrome/browser/chromeos/cros/syslogs_library.h
M chrome/browser/chromeos/wm_ipc.h
M chrome/browser/chromeos/system_key_event_listener.cc
M chrome/browser/chromeos/DEPS
Total comments: 1
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+79 lines, -58 lines) |
Patch |
|
M |
build/common.gypi
|
View
|
2
3
|
1 chunk |
+5 lines, -0 lines |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/DEPS
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
D |
chrome/browser/chromeos/cros/cros_api.gyp
|
View
|
2
3
|
1 chunk |
+0 lines, -18 lines |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/cros/cros_in_process_browser_test.h
|
View
|
3
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/cros/cros_library_loader.cc
|
View
|
3
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/cros/cryptohome_library.h
|
View
|
3
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/cros/input_method_library.h
|
View
|
3
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/cros/keyboard_library.h
|
View
|
3
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/cros/keyboard_library.cc
|
View
|
3
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/cros/login_library.h
|
View
|
3
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/cros/mock_mount_library.h
|
View
|
3
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/cros/mount_library.h
|
View
|
3
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/cros/network_library.h
|
View
|
3
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/cros/power_library.h
|
View
|
3
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/cros/screen_lock_library.h
|
View
|
3
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/cros/speech_synthesis_library.cc
|
View
|
3
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/cros/synaptics_library.h
|
View
|
3
|
2 chunks |
+5 lines, -3 lines |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/cros/syslogs_library.h
|
View
|
3
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/cros/system_library.h
|
View
|
3
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/cros/update_library.h
|
View
|
3
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/frame/browser_view.cc
|
View
|
3
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/frame/panel_controller.cc
|
View
|
3
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/google_update_chromeos.cc
|
View
|
3
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/input_method/candidate_window.cc
|
View
|
3
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/input_method/candidate_window.gyp
|
View
|
1
2
3
|
1 chunk |
+17 lines, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/login/background_view.cc
|
View
|
3
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/login/screen_locker.cc
|
View
|
3
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/login/user_controller.cc
|
View
|
3
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/login/wizard_controller.cc
|
View
|
3
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/options/language_config_model.h
|
View
|
3
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/panels/panel_browsertest.cc
|
View
|
3
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/system_key_event_listener.cc
|
View
|
3
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/chromeos/wm_ipc.h
|
View
|
3
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
MM |
chrome/browser/chromeos/wm_overview_fav_icon.cc
|
View
|
3
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
MM |
chrome/browser/chromeos/wm_overview_title.cc
|
View
|
3
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/views/browser_bubble_gtk.cc
|
View
|
3
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/views/extensions/extension_popup.cc
|
View
|
3
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/browser/views/info_bubble.cc
|
View
|
3
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/chrome_browser.gypi
|
View
|
1
2
3
|
1 chunk |
+17 lines, -1 line |
0 comments
|
Download
|
Total messages: 8 (0 generated)
|