Unified 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.
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')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: mobile/android/base/moz.build |
| =================================================================== |
| --- a/mobile/android/base/moz.build |
| +++ b/mobile/android/base/moz.build |
| @@ -835,22 +835,25 @@ gbjar.sources += ['java/org/mozilla/geck |
| ]] |
| # Adblock Browser |
| gbjar.sources += [ thirdparty_source_dir + f for f in [ |
| 'org/adblockplus/browser/AbpCheckBoxPreference.java', |
| 'org/adblockplus/browser/AdblockPlusApiCallback.java', |
| 'org/adblockplus/browser/AddOnBridge.java', |
| 'org/adblockplus/browser/BrowserAppUtils.java', |
| + 'org/adblockplus/browser/InputValidatorDialogPreference.java', |
| 'org/adblockplus/browser/MoreSubscriptionsPreferenceGroup.java', |
| 'org/adblockplus/browser/StartPane.java', |
| 'org/adblockplus/browser/SubscriptionContainer.java', |
| 'org/adblockplus/browser/SubscriptionPreferenceCategory.java', |
| - 'org/adblockplus/browser/UrlInputDialog.java', |
| - 'org/adblockplus/browser/UrlInputOpenerPreference.java', |
| + 'org/adblockplus/browser/UrlUtils.java', |
| + 'org/adblockplus/browser/WhitelistedWebsitesPreferenceGroup.java', |
| + 'org/apache/commons/validator/routines/DomainValidator.java', |
| + 'org/apache/commons/validator/routines/RegexValidator.java', |
| ]] |
| android_package_dir = CONFIG['ANDROID_PACKAGE_NAME'].replace('.', '/') |
| gbjar.generated_sources = [] # Keep it this way. |
| gbjar.extra_jars += [ |
| CONFIG['ANDROID_SUPPORT_ANNOTATIONS_JAR_LIB'], |
| CONFIG['ANDROID_SUPPORT_V4_AAR_LIB'], |
| CONFIG['ANDROID_SUPPORT_V4_AAR_INTERNAL_LIB'], |
