Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: mobile/android/base/moz.build

Issue 29322610: Issue 2720 - [Adblocking settings] Add the other filter lists category (Closed)
Left Patch Set: Changed screen title Created July 20, 2015, 5 p.m.
Right Patch Set: Last naming nit Created July 31, 2015, 9:36 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
LEFTRIGHT
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
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/MoreSubscriptionsPreferenceGroup.java',
556 'org/adblockplus/browser/StartPane.java', 556 'org/adblockplus/browser/StartPane.java',
557 'org/adblockplus/browser/SubscriptionContainer.java',
557 'org/adblockplus/browser/SubscriptionPreferenceCategory.java', 558 'org/adblockplus/browser/SubscriptionPreferenceCategory.java',
558 'org/adblockplus/browser/UrlInputDialog.java', 559 'org/adblockplus/browser/UrlInputDialog.java',
559 'org/adblockplus/browser/UrlInputOpenerPreference.java', 560 'org/adblockplus/browser/UrlInputOpenerPreference.java',
560 ] ] 561 ] ]
561 562
562 android_package_dir = CONFIG['ANDROID_PACKAGE_NAME'].replace('.', '/') 563 android_package_dir = CONFIG['ANDROID_PACKAGE_NAME'].replace('.', '/')
563 gbjar.generated_sources = [] # Keep it this way. 564 gbjar.generated_sources = [] # Keep it this way.
564 gbjar.extra_jars += [ 565 gbjar.extra_jars += [
565 'constants.jar' 566 'constants.jar'
566 ] 567 ]
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
948 resources.included_projects += ['../' + crashreporter.name] 949 resources.included_projects += ['../' + crashreporter.name]
949 resources.referenced_projects += ['../' + crashreporter.name] 950 resources.referenced_projects += ['../' + crashreporter.name]
950 951
951 if CONFIG['MOZ_ANDROID_MLS_STUMBLER']: 952 if CONFIG['MOZ_ANDROID_MLS_STUMBLER']:
952 main.included_projects += ['../FennecStumbler'] 953 main.included_projects += ['../FennecStumbler']
953 main.referenced_projects += ['../FennecStumbler'] 954 main.referenced_projects += ['../FennecStumbler']
954 955
955 if CONFIG['MOZ_ANDROID_SEARCH_ACTIVITY']: 956 if CONFIG['MOZ_ANDROID_SEARCH_ACTIVITY']:
956 # The Search Activity code is built as part of Fennec, so we follow suit in Eclipse. 957 # The Search Activity code is built as part of Fennec, so we follow suit in Eclipse.
957 main.add_classpathentry('search', TOPSRCDIR + '/mobile/android/search/java', dstdir='search') 958 main.add_classpathentry('search', TOPSRCDIR + '/mobile/android/search/java', dstdir='search')
LEFTRIGHT

Powered by Google App Engine
This is Rietveld