Chromium Browser

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

  1. chromium-browser.dev.daily
  2. Merge into chromium-browser.dev.daily
Proposed by Brandon Snider
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 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

fixed chromium-browser.install

580. By Brandon Snider

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
=== modified file 'debian/chromium-browser.install'
--- debian/chromium-browser.install 2011-08-12 10:31:52 +0000
+++ debian/chromium-browser.install 2011-12-15 00:42:24 +0000
@@ -2,9 +2,10 @@
2debian/tmp/usr/bin2debian/tmp/usr/bin
3debian/tmp/usr/lib/chromium-browser/chromium*3debian/tmp/usr/lib/chromium-browser/chromium*
4debian/tmp/usr/lib/chromium-browser/chrome.pak4debian/tmp/usr/lib/chromium-browser/chrome.pak
5debian/tmp/usr/lib/chromium-browser/content_resources.pak
6debian/tmp/usr/lib/chromium-browser/resources.pak
5debian/tmp/usr/lib/chromium-browser/xdg-settings7debian/tmp/usr/lib/chromium-browser/xdg-settings
6debian/tmp/usr/lib/chromium-browser/xdg-mime8debian/tmp/usr/lib/chromium-browser/xdg-mime
7debian/tmp/usr/lib/chromium-browser/resources.pak
8debian/tmp/usr/lib/chromium-browser/locales/*9debian/tmp/usr/lib/chromium-browser/locales/*
9debian/chromium-browser.desktop usr/share/applications10debian/chromium-browser.desktop usr/share/applications
10debian/chromium-browser.xml usr/share/gnome-control-center/default-apps11debian/chromium-browser.xml usr/share/gnome-control-center/default-apps
1112
=== modified file 'debian/patches/disable_dlog_and_dcheck_in_release_builds.patch'
--- debian/patches/disable_dlog_and_dcheck_in_release_builds.patch 2010-10-02 16:21:17 +0000
+++ debian/patches/disable_dlog_and_dcheck_in_release_builds.patch 2011-12-15 00:42:24 +0000
@@ -6,22 +6,12 @@
6===================================================================6===================================================================
7--- src.orig/base/logging.h7--- src.orig/base/logging.h
8+++ src/base/logging.h8+++ src/base/logging.h
9@@ -495,17 +495,17 @@9@@ -451,7 +451,7 @@ const LogSeverity LOG_0 = LOG_ERROR;
10 #define CHECK_LT(val1, val2) CHECK_OP(LT, < , val1, val2)
11 #define CHECK_GE(val1, val2) CHECK_OP(GE, >=, val1, val2)
12 #define CHECK_GT(val1, val2) CHECK_OP(GT, > , val1, val2)
13
14 // http://crbug.com/16512 is open for a real fix for this. For now, Windows
15 // uses OFFICIAL_BUILD and other platforms use the branding flag when NDEBUG is10 // uses OFFICIAL_BUILD and other platforms use the branding flag when NDEBUG is
16 // defined.11 // defined.
17 #if ( defined(OS_WIN) && defined(OFFICIAL_BUILD)) || \12 #if ( defined(OS_WIN) && defined(OFFICIAL_BUILD)) || \
18- (!defined(OS_WIN) && defined(NDEBUG) && defined(GOOGLE_CHROME_BUILD))13- (!defined(OS_WIN) && defined(NDEBUG) && defined(GOOGLE_CHROME_BUILD))
19+ (!defined(OS_WIN) && defined(NDEBUG))14+ (!defined(OS_WIN) && defined(NDEBUG))
20 // Used by unit tests.15 #define LOGGING_IS_OFFICIAL_BUILD 1
21 #define LOGGING_IS_OFFICIAL_BUILD16 #else
22 17 #define LOGGING_IS_OFFICIAL_BUILD 0
23 // In order to have optimized code for official builds, remove DLOGs and
24 // DCHECKs.
25 #define ENABLE_DLOG 0
26 #define ENABLE_DCHECK 0
27

Subscribers

People subscribed via source and target branches