Merge lp:~brandonsnider/chromium-browser/chromium-browser.dev.daily into lp:~chromium-daily/chromium-browser/chromium-browser.dev.daily

Proposed by Brandon Snider on 2011-12-15
Status: Needs review
Proposed branch: lp:~brandonsnider/chromium-browser/chromium-browser.dev.daily
Merge into: lp:~chromium-daily/chromium-browser/chromium-browser.dev.daily
Diff against target: 46 lines (+6/-15)
2 files modified
debian/chromium-browser.install (+2/-1)
debian/patches/disable_dlog_and_dcheck_in_release_builds.patch (+4/-14)
To merge this branch: bzr merge lp:~brandonsnider/chromium-browser/chromium-browser.dev.daily
Reviewer Review Type Date Requested Status
Chromium Builds 2011-12-15 Pending
Review via email: mp+85771@code.launchpad.net

Description of the change

fixed chromium-browser.install

To post a comment you must log in.

Unmerged revisions

581. By Brandon Snider on 2011-12-14

fixed chromium-browser.install

580. By Brandon Snider on 2011-12-14

fixed disable_dlog_and_dcheck_in_release_builds.patch

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/chromium-browser.install'
2--- debian/chromium-browser.install 2011-08-12 10:31:52 +0000
3+++ debian/chromium-browser.install 2011-12-15 00:42:24 +0000
4@@ -2,9 +2,10 @@
5 debian/tmp/usr/bin
6 debian/tmp/usr/lib/chromium-browser/chromium*
7 debian/tmp/usr/lib/chromium-browser/chrome.pak
8+debian/tmp/usr/lib/chromium-browser/content_resources.pak
9+debian/tmp/usr/lib/chromium-browser/resources.pak
10 debian/tmp/usr/lib/chromium-browser/xdg-settings
11 debian/tmp/usr/lib/chromium-browser/xdg-mime
12-debian/tmp/usr/lib/chromium-browser/resources.pak
13 debian/tmp/usr/lib/chromium-browser/locales/*
14 debian/chromium-browser.desktop usr/share/applications
15 debian/chromium-browser.xml usr/share/gnome-control-center/default-apps
16
17=== modified file 'debian/patches/disable_dlog_and_dcheck_in_release_builds.patch'
18--- debian/patches/disable_dlog_and_dcheck_in_release_builds.patch 2010-10-02 16:21:17 +0000
19+++ debian/patches/disable_dlog_and_dcheck_in_release_builds.patch 2011-12-15 00:42:24 +0000
20@@ -6,22 +6,12 @@
21 ===================================================================
22 --- src.orig/base/logging.h
23 +++ src/base/logging.h
24-@@ -495,17 +495,17 @@
25- #define CHECK_LT(val1, val2) CHECK_OP(LT, < , val1, val2)
26- #define CHECK_GE(val1, val2) CHECK_OP(GE, >=, val1, val2)
27- #define CHECK_GT(val1, val2) CHECK_OP(GT, > , val1, val2)
28-
29- // http://crbug.com/16512 is open for a real fix for this. For now, Windows
30+@@ -451,7 +451,7 @@ const LogSeverity LOG_0 = LOG_ERROR;
31 // uses OFFICIAL_BUILD and other platforms use the branding flag when NDEBUG is
32 // defined.
33 #if ( defined(OS_WIN) && defined(OFFICIAL_BUILD)) || \
34 - (!defined(OS_WIN) && defined(NDEBUG) && defined(GOOGLE_CHROME_BUILD))
35 + (!defined(OS_WIN) && defined(NDEBUG))
36- // Used by unit tests.
37- #define LOGGING_IS_OFFICIAL_BUILD
38-
39- // In order to have optimized code for official builds, remove DLOGs and
40- // DCHECKs.
41- #define ENABLE_DLOG 0
42- #define ENABLE_DCHECK 0
43-
44+ #define LOGGING_IS_OFFICIAL_BUILD 1
45+ #else
46+ #define LOGGING_IS_OFFICIAL_BUILD 0

Subscribers

People subscribed via source and target branches