summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTarun Nainani <tnainani@codeaurora.org>2015-08-19 01:26:36 -0700
committerjrizzoli <joey@cyanogenmoditalia.it>2015-08-28 13:15:48 +0200
commit620d8582e152b3583905b6d646613a71bc9b94d4 (patch)
treed2fef328aa567743a54918becd6c942f218f76cf
parentdfe37a409b29bc5aade33a6601d83931aaf9a13c (diff)
downloadandroid_packages_apps_Gello-620d8582e152b3583905b6d646613a71bc9b94d4.tar.gz
android_packages_apps_Gello-620d8582e152b3583905b6d646613a71bc9b94d4.tar.bz2
android_packages_apps_Gello-620d8582e152b3583905b6d646613a71bc9b94d4.zip
Fix errors found with proguard
By default disable progaurd as enabling it will remove all java classes marked as unused but they may be used by native. To enable proguard need proguard.cfg file to have keep rules for Java classes which are either used by native or dynamically called. Change-Id: I54e990d9b829be54656a5904cb1427a2d2867234
-rw-r--r--AndroidManifest.xml.jinja22
-rw-r--r--swe_android_browser.gypi2
2 files changed, 3 insertions, 1 deletions
diff --git a/AndroidManifest.xml.jinja2 b/AndroidManifest.xml.jinja2
index 3499f52f..c349b8bb 100644
--- a/AndroidManifest.xml.jinja2
+++ b/AndroidManifest.xml.jinja2
@@ -400,7 +400,7 @@
</provider>
<service
- android:name=".UpdateNotificationService"
+ android:name="com.android.browser.UpdateNotificationService"
android:exported="false" >
</service>
diff --git a/swe_android_browser.gypi b/swe_android_browser.gypi
index d5162175..6012e319 100644
--- a/swe_android_browser.gypi
+++ b/swe_android_browser.gypi
@@ -17,6 +17,8 @@
'native_lib_version_name': '<(version_full)',
'java_in_dir': '.',
'resource_dir': '../browser/res',
+ #TODO need proguard config file before we can enable this
+ 'proguard_enabled': 'false',
'conditions': [
['icu_use_data_file_flag==1', {
'additional_input_paths': [