summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKulanthaivel Palanichamy <kulanthaivel@codeaurora.org>2015-10-06 18:03:26 -0700
committerjrizzoli <joey@cyanogenmoditalia.it>2015-11-05 14:33:36 +0100
commit359f55bf1d45804b4caecc934d0c89d171bc63fa (patch)
tree832dcb2ae71ca27dc0922bff81dce02b432cfa83
parent13fca8d729e188ca71802408b095d256a499a750 (diff)
downloadandroid_packages_apps_Gello-359f55bf1d45804b4caecc934d0c89d171bc63fa.tar.gz
android_packages_apps_Gello-359f55bf1d45804b4caecc934d0c89d171bc63fa.tar.bz2
android_packages_apps_Gello-359f55bf1d45804b4caecc934d0c89d171bc63fa.zip
Remove web_refiner.conf from assets
Change-Id: I3126a6695f3a22ea5a0b7d9462e089d204146936
-rw-r--r--assets/web_refiner/web_refiner.conf27
-rw-r--r--res/raw/web_refiner_conf27
-rw-r--r--swe_android_browser.gypi6
-rw-r--r--swe_res.gypi6
4 files changed, 27 insertions, 39 deletions
diff --git a/assets/web_refiner/web_refiner.conf b/assets/web_refiner/web_refiner.conf
deleted file mode 100644
index 03d35983..00000000
--- a/assets/web_refiner/web_refiner.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "version": "1.0",
- "update": {},
- "subscriptions": [
- {
- "name" : "Malware Domains Filter",
- "category" : "MALWARE_DOMAINS",
- "format" : "WebRefiner 1.0",
- "url" : "none",
- "expiration" : "5 days"
- },
- {
- "name" : "Privacy Filter",
- "category" : "TRACKERS",
- "format" : "WebRefiner 1.0",
- "url" : "none",
- "expiration" : "5 days"
- },
- {
- "name" : "Ad Filter",
- "category" : "ADS",
- "format" : "WebRefiner 1.0",
- "url" : "none",
- "expiration" : "5 days"
- }
- ]
-}
diff --git a/res/raw/web_refiner_conf b/res/raw/web_refiner_conf
index e69de29b..03d35983 100644
--- a/res/raw/web_refiner_conf
+++ b/res/raw/web_refiner_conf
@@ -0,0 +1,27 @@
+{
+ "version": "1.0",
+ "update": {},
+ "subscriptions": [
+ {
+ "name" : "Malware Domains Filter",
+ "category" : "MALWARE_DOMAINS",
+ "format" : "WebRefiner 1.0",
+ "url" : "none",
+ "expiration" : "5 days"
+ },
+ {
+ "name" : "Privacy Filter",
+ "category" : "TRACKERS",
+ "format" : "WebRefiner 1.0",
+ "url" : "none",
+ "expiration" : "5 days"
+ },
+ {
+ "name" : "Ad Filter",
+ "category" : "ADS",
+ "format" : "WebRefiner 1.0",
+ "url" : "none",
+ "expiration" : "5 days"
+ }
+ ]
+}
diff --git a/swe_android_browser.gypi b/swe_android_browser.gypi
index fcaaeb8d..a796f053 100644
--- a/swe_android_browser.gypi
+++ b/swe_android_browser.gypi
@@ -55,12 +55,6 @@
'<@(swe_assets_wml)',
],
},
- {
- 'destination': '<(PRODUCT_DIR)/swe_android_browser_apk/assets/web_refiner',
- 'files': [
- '<@(swe_assets_webrefiner)',
- ],
- },
],
'includes': [ '../../build/java_apk.gypi' ],
},
diff --git a/swe_res.gypi b/swe_res.gypi
index 6a9621ce..dd0d7466 100644
--- a/swe_res.gypi
+++ b/swe_res.gypi
@@ -43,12 +43,6 @@
'<(PRODUCT_DIR)/swe_android_browser_apk/assets/wml/swe_wml.css',
],
},
- {
- 'destination': '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/assets/web_refiner',
- 'files': [
- '<(PRODUCT_DIR)/swe_android_browser_apk/assets/web_refiner/web_refiner.conf',
- ],
- },
#ui res
{