Side by Side Diff: mobile/android/base/moz.build
Issue 29543774:
Issue 2801 - Create 'Whitelisted websites' screen and add link to 'Ad blocking' screen (Closed)
Patch Set: Adjustments accordingly to Thomas's comments. Also, adjusting strings for multilocale build
Created Sept. 19, 2017, 3:18 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« mobile/android/base/locales/adblockbrowser/ar/android_strings.dtd ('K')
|
« mobile/android/base/locales/adblockbrowser/zh-TW/android_strings.dtd ('k')
|
mobile/android/base/resources/layout/abb_url_input_dialog.xml » ('j')
|
mobile/android/thirdparty/org/adblockplus/browser/UrlUtils.java » ('J')
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')
| 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 | 8 |
| 9 GENERATED_FILES += [ | 9 GENERATED_FILES += [ |
| 10 '../geckoview/generated/preprocessed/org/mozilla/geckoview/BuildConfig.java' , | 10 '../geckoview/generated/preprocessed/org/mozilla/geckoview/BuildConfig.java' , |
| (...skipping 822 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 833 'widget/themed/ThemedTextView.java', | 833 'widget/themed/ThemedTextView.java', |
| 834 'widget/themed/ThemedView.java', | 834 'widget/themed/ThemedView.java', |
| 835 ]] | 835 ]] |
| 836 | 836 |
| 837 # Adblock Browser | 837 # Adblock Browser |
| 838 gbjar.sources += [ thirdparty_source_dir + f for f in [ | 838 gbjar.sources += [ thirdparty_source_dir + f for f in [ |
| 839 'org/adblockplus/browser/AbpCheckBoxPreference.java', | 839 'org/adblockplus/browser/AbpCheckBoxPreference.java', |
| 840 'org/adblockplus/browser/AdblockPlusApiCallback.java', | 840 'org/adblockplus/browser/AdblockPlusApiCallback.java', |
| 841 'org/adblockplus/browser/AddOnBridge.java', | 841 'org/adblockplus/browser/AddOnBridge.java', |
| 842 'org/adblockplus/browser/BrowserAppUtils.java', | 842 'org/adblockplus/browser/BrowserAppUtils.java', |
| 843 'org/adblockplus/browser/InputValidatorDialogPreference.java', | |
| 843 'org/adblockplus/browser/MoreSubscriptionsPreferenceGroup.java', | 844 'org/adblockplus/browser/MoreSubscriptionsPreferenceGroup.java', |
| 844 'org/adblockplus/browser/StartPane.java', | 845 'org/adblockplus/browser/StartPane.java', |
| 845 'org/adblockplus/browser/SubscriptionContainer.java', | 846 'org/adblockplus/browser/SubscriptionContainer.java', |
| 846 'org/adblockplus/browser/SubscriptionPreferenceCategory.java', | 847 'org/adblockplus/browser/SubscriptionPreferenceCategory.java', |
| 847 'org/adblockplus/browser/UrlInputDialog.java', | 848 'org/adblockplus/browser/UrlUtils.java', |
| 848 'org/adblockplus/browser/UrlInputOpenerPreference.java', | 849 'org/adblockplus/browser/WhitelistedWebsitesPreferenceGroup.java', |
| 850 'org/apache/commons/validator/routines/DomainValidator.java', | |
| 851 'org/apache/commons/validator/routines/RegexValidator.java', | |
| 849 ]] | 852 ]] |
| 850 | 853 |
| 851 android_package_dir = CONFIG['ANDROID_PACKAGE_NAME'].replace('.', '/') | 854 android_package_dir = CONFIG['ANDROID_PACKAGE_NAME'].replace('.', '/') |
| 852 gbjar.generated_sources = [] # Keep it this way. | 855 gbjar.generated_sources = [] # Keep it this way. |
| 853 gbjar.extra_jars += [ | 856 gbjar.extra_jars += [ |
| 854 CONFIG['ANDROID_SUPPORT_ANNOTATIONS_JAR_LIB'], | 857 CONFIG['ANDROID_SUPPORT_ANNOTATIONS_JAR_LIB'], |
| 855 CONFIG['ANDROID_SUPPORT_V4_AAR_LIB'], | 858 CONFIG['ANDROID_SUPPORT_V4_AAR_LIB'], |
| 856 CONFIG['ANDROID_SUPPORT_V4_AAR_INTERNAL_LIB'], | 859 CONFIG['ANDROID_SUPPORT_V4_AAR_INTERNAL_LIB'], |
| 857 'constants.jar' | 860 'constants.jar' |
| 858 ] | 861 ] |
| (...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1195 'media/ICodec.java', | 1198 'media/ICodec.java', |
| 1196 'media/ICodecCallbacks.java', | 1199 'media/ICodecCallbacks.java', |
| 1197 'media/IMediaDrmBridge.java', | 1200 'media/IMediaDrmBridge.java', |
| 1198 'media/IMediaDrmBridgeCallbacks.java', | 1201 'media/IMediaDrmBridgeCallbacks.java', |
| 1199 'media/IMediaManager.java', | 1202 'media/IMediaManager.java', |
| 1200 ]] | 1203 ]] |
| 1201 | 1204 |
| 1202 gvjar.sources += ['generated/org/mozilla/gecko/' + x for x in [ | 1205 gvjar.sources += ['generated/org/mozilla/gecko/' + x for x in [ |
| 1203 'process/IChildProcess.java', | 1206 'process/IChildProcess.java', |
| 1204 ]] | 1207 ]] |
| OLD | NEW |
