mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-02-11 01:20:44 +01:00
099664fba0
- Update tracing implementation to use the new file-based approach (issue #1157). git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1549 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
37 lines
1.4 KiB
Diff
37 lines
1.4 KiB
Diff
Index: common.gypi
|
|
===================================================================
|
|
--- common.gypi (revision 240657)
|
|
+++ common.gypi (working copy)
|
|
@@ -9,6 +9,9 @@
|
|
# Variables expected to be overriden on the GYP command line (-D) or by
|
|
# ~/.gyp/include.gypi.
|
|
'variables': {
|
|
+ # Directory for CEF source files. This will be set by cef.gypi.
|
|
+ 'cef_directory%' : '',
|
|
+
|
|
# Putting a variables dict inside another variables dict looks kind of
|
|
# weird. This is done so that 'host_arch', 'chromeos', etc are defined as
|
|
# variables within the outer variables dict here. This is necessary
|
|
@@ -201,7 +204,7 @@
|
|
'enable_app_list%': 0,
|
|
}],
|
|
|
|
- ['use_aura==1 or (OS!="win" and OS!="mac" and OS!="ios" and OS!="android")', {
|
|
+ ['OS!="win" and OS!="mac" and OS!="ios" and OS!="android"', {
|
|
'use_default_render_theme%': 1,
|
|
}, {
|
|
'use_default_render_theme%': 0,
|
|
Index: mac/strip_save_dsym
|
|
===================================================================
|
|
--- mac/strip_save_dsym (revision 240657)
|
|
+++ mac/strip_save_dsym (working copy)
|
|
@@ -48,7 +48,7 @@
|
|
"bundle"]
|
|
macho_types_re = "Mach-O (?:64-bit )?(?:" + "|".join(macho_types) + ")"
|
|
|
|
- file_cmd = subprocess.Popen(["/usr/bin/file", "-b", "--", macho],
|
|
+ file_cmd = subprocess.Popen(["/usr/bin/file", "-b", "-L", "--", macho],
|
|
stdout=subprocess.PIPE)
|
|
|
|
archs = []
|