Delta Between Two Patch Sets: mobile/android/base/moz.build
Issue 5365916275572736:
Issue 2351 - Add a custom menu item for whitelisting the current site (Closed)
Left Patch Set:
Created April 25, 2015, 9:45 p.m.
Right Patch Set: Address comments, rename location, change item label
Created May 6, 2015, 4:41 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« mobile/android/base/locales/en-US/android_strings.dtd ('k')
|
mobile/android/base/resources/menu-large-v11/browser_app_menu.xml » ('j')
|
no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| LEFT | RIGHT |
|---|---|
| (no file at all) | |
| 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 451 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 462 gbjar.sources += [ thirdparty_source_dir + f for f in [ | 462 gbjar.sources += [ thirdparty_source_dir + f for f in [ |
| 463 'com/googlecode/eyesfree/braille/selfbraille/ISelfBrailleService.java', | 463 'com/googlecode/eyesfree/braille/selfbraille/ISelfBrailleService.java', |
| 464 'com/googlecode/eyesfree/braille/selfbraille/SelfBrailleClient.java', | 464 'com/googlecode/eyesfree/braille/selfbraille/SelfBrailleClient.java', |
| 465 'com/googlecode/eyesfree/braille/selfbraille/WriteData.java', | 465 'com/googlecode/eyesfree/braille/selfbraille/WriteData.java', |
| 466 ] ] | 466 ] ] |
| 467 # Adblock Browser | 467 # Adblock Browser |
| 468 gbjar.sources += [ thirdparty_source_dir + f for f in [ | 468 gbjar.sources += [ thirdparty_source_dir + f for f in [ |
| 469 'org/adblockplus/browser/AbpCheckBoxPreference.java', | 469 'org/adblockplus/browser/AbpCheckBoxPreference.java', |
| 470 'org/adblockplus/browser/AdblockPlusApiCallback.java', | 470 'org/adblockplus/browser/AdblockPlusApiCallback.java', |
| 471 'org/adblockplus/browser/AddOnBridge.java', | 471 'org/adblockplus/browser/AddOnBridge.java', |
| 472 'org/adblockplus/browser/BrowserAppUtils.java', | |
| 472 'org/adblockplus/browser/StartPane.java', | 473 'org/adblockplus/browser/StartPane.java', |
| 473 'org/adblockplus/browser/SubscriptionPreferenceCategory.java', | 474 'org/adblockplus/browser/SubscriptionPreferenceCategory.java', |
| 474 ] ] | 475 ] ] |
| 475 | 476 |
| 476 android_package_dir = CONFIG['ANDROID_PACKAGE_NAME'].replace('.', '/') | 477 android_package_dir = CONFIG['ANDROID_PACKAGE_NAME'].replace('.', '/') |
| 477 gbjar.generated_sources += [ | 478 gbjar.generated_sources += [ |
| 478 'org/mozilla/gecko/SysInfo.java', | 479 'org/mozilla/gecko/SysInfo.java', |
| 479 'org/mozilla/gecko/widget/ThemedEditText.java', | 480 'org/mozilla/gecko/widget/ThemedEditText.java', |
| 480 'org/mozilla/gecko/widget/ThemedImageButton.java', | 481 'org/mozilla/gecko/widget/ThemedImageButton.java', |
| 481 'org/mozilla/gecko/widget/ThemedImageView.java', | 482 'org/mozilla/gecko/widget/ThemedImageView.java', |
| (...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 820 searchres.res = SRCDIR + '/../search/res' | 821 searchres.res = SRCDIR + '/../search/res' |
| 821 | 822 |
| 822 searchres.included_projects += ['../' + static.name, '../' + generated.name, '../' + branding.name] | 823 searchres.included_projects += ['../' + static.name, '../' + generated.name, '../' + branding.name] |
| 823 searchres.referenced_projects += ['../' + static.name, '../' + generated.nam e, '../' + branding.name] | 824 searchres.referenced_projects += ['../' + static.name, '../' + generated.nam e, '../' + branding.name] |
| 824 | 825 |
| 825 resources.included_projects += ['../' + searchres.name] | 826 resources.included_projects += ['../' + searchres.name] |
| 826 resources.referenced_projects += ['../' + searchres.name] | 827 resources.referenced_projects += ['../' + searchres.name] |
| 827 | 828 |
| 828 # The Search Activity code is built as part of Fennec, so we follow suit in Eclipse. | 829 # The Search Activity code is built as part of Fennec, so we follow suit in Eclipse. |
| 829 main.add_classpathentry('search', TOPSRCDIR + '/mobile/android/search/java', dstdir='search') | 830 main.add_classpathentry('search', TOPSRCDIR + '/mobile/android/search/java', dstdir='search') |
| LEFT | RIGHT |
« mobile/android/base/locales/en-US/android_strings.dtd ('k')
|
mobile/android/base/resources/menu-large-v11/browser_app_menu.xml » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
