mobile/android/base/moz.build - Issue 29322610: Issue 2720 - [Adblocking settings] Add the other filter lists category

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments.

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Side by Side Diff: mobile/android/base/moz.build

Issue 29322610: Issue 2720 - [Adblocking settings] Add the other filter lists category (Closed)

Patch Set: Changed screen title Created July 20, 2015, 5 p.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View unified diff | Download patch

« mobile/android/base/locales/en-US/android_strings.dtd ('K') | « mobile/android/base/locales/en-US/android_strings.dtd ('k') | mobile/android/base/resources/drawable/abb_edittext_bkg.9.png » ('j') | mobile/android/base/resources/layout/abb_custom_prefscreen.xml » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 # -- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 --	1 # -- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 --

2 # vim: set filetype=python:	2 # vim: set filetype=python:

3 # This Source Code Form is subject to the terms of the Mozilla Public	3 # This Source Code Form is subject to the terms of the Mozilla Public

4 # License, v. 2.0. If a copy of the MPL was not distributed with this	4 # License, v. 2.0. If a copy of the MPL was not distributed with this

5 # file, You can obtain one at http://mozilla.org/MPL/2.0/.	5 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

6	6

7 DIRS += ['locales']	7 DIRS += ['locales']

8 SPHINX_TREES['fennec'] = 'docs'	8 SPHINX_TREES['fennec'] = 'docs'

9	9

10 include('android-services.mozbuild')	10 include('android-services.mozbuild')

(...skipping 534 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
545 'com/googlecode/eyesfree/braille/selfbraille/ISelfBrailleService.java',	545 'com/googlecode/eyesfree/braille/selfbraille/ISelfBrailleService.java',

546 'com/googlecode/eyesfree/braille/selfbraille/SelfBrailleClient.java',	546 'com/googlecode/eyesfree/braille/selfbraille/SelfBrailleClient.java',

547 'com/googlecode/eyesfree/braille/selfbraille/WriteData.java',	547 'com/googlecode/eyesfree/braille/selfbraille/WriteData.java',

548 ] ]	548 ] ]

549 # Adblock Browser	549 # Adblock Browser

550 gbjar.sources += [ thirdparty_source_dir + f for f in [	550 gbjar.sources += [ thirdparty_source_dir + f for f in [

551 'org/adblockplus/browser/AbpCheckBoxPreference.java',	551 'org/adblockplus/browser/AbpCheckBoxPreference.java',

552 'org/adblockplus/browser/AdblockPlusApiCallback.java',	552 'org/adblockplus/browser/AdblockPlusApiCallback.java',

553 'org/adblockplus/browser/AddOnBridge.java',	553 'org/adblockplus/browser/AddOnBridge.java',

554 'org/adblockplus/browser/BrowserAppUtils.java',	554 'org/adblockplus/browser/BrowserAppUtils.java',

	555 'org/adblockplus/browser/OtherPreferenceGroup.java',

555 'org/adblockplus/browser/StartPane.java',	556 'org/adblockplus/browser/StartPane.java',

556 'org/adblockplus/browser/SubscriptionPreferenceCategory.java',	557 'org/adblockplus/browser/SubscriptionPreferenceCategory.java',

	558 'org/adblockplus/browser/UrlInputDialog.java',

	559 'org/adblockplus/browser/UrlInputOpenerPreference.java',

557 ] ]	560 ] ]

558	561

559 android_package_dir = CONFIG['ANDROID_PACKAGE_NAME'].replace('.', '/')	562 android_package_dir = CONFIG['ANDROID_PACKAGE_NAME'].replace('.', '/')

560 gbjar.generated_sources = [] # Keep it this way.	563 gbjar.generated_sources = [] # Keep it this way.

561 gbjar.extra_jars += [	564 gbjar.extra_jars += [

562 'constants.jar'	565 'constants.jar'

563 ]	566 ]

564 if CONFIG['MOZ_CRASHREPORTER']:	567 if CONFIG['MOZ_CRASHREPORTER']:

565 gbjar.sources += [ 'CrashReporter.java' ]	568 gbjar.sources += [ 'CrashReporter.java' ]

566 ANDROID_RES_DIRS += [ SRCDIR + '/crashreporter/res' ]	569 ANDROID_RES_DIRS += [ SRCDIR + '/crashreporter/res' ]

(...skipping 378 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
945 resources.included_projects += ['../' + crashreporter.name]	948 resources.included_projects += ['../' + crashreporter.name]

946 resources.referenced_projects += ['../' + crashreporter.name]	949 resources.referenced_projects += ['../' + crashreporter.name]

947	950

948 if CONFIG['MOZ_ANDROID_MLS_STUMBLER']:	951 if CONFIG['MOZ_ANDROID_MLS_STUMBLER']:

949 main.included_projects += ['../FennecStumbler']	952 main.included_projects += ['../FennecStumbler']

950 main.referenced_projects += ['../FennecStumbler']	953 main.referenced_projects += ['../FennecStumbler']

951	954

952 if CONFIG['MOZ_ANDROID_SEARCH_ACTIVITY']:	955 if CONFIG['MOZ_ANDROID_SEARCH_ACTIVITY']:

953 # The Search Activity code is built as part of Fennec, so we follow suit in Eclipse.	956 # The Search Activity code is built as part of Fennec, so we follow suit in Eclipse.

954 main.add_classpathentry('search', TOPSRCDIR + '/mobile/android/search/java', dstdir='search')	957 main.add_classpathentry('search', TOPSRCDIR + '/mobile/android/search/java', dstdir='search')

OLD	NEW