yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-03 09:49:19 +02:00
Code Issues Releases Wiki Activity

jni/proguard changes for new package structure

Browse source
This commit is contained in:
Nikolay Pultsin 2013-01-13 07:47:55 +04:00
parent 4b10755383
commit b21459cdd0
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
jni/NativeFormats/util/AndroidUtil.cpp
View file

@ -47,8 +47,8 @@ JavaClass AndroidUtil::Class_JavaEncodingCollection("org/geometerplus/zlibrary/c
JavaClass AndroidUtil::Class_NativeFormatPlugin("org/geometerplus/fbreader/formats/NativeFormatPlugin"); JavaClass AndroidUtil::Class_NativeFormatPlugin("org/geometerplus/fbreader/formats/NativeFormatPlugin");
JavaClass AndroidUtil::Class_PluginCollection("org/geometerplus/fbreader/formats/PluginCollection"); JavaClass AndroidUtil::Class_PluginCollection("org/geometerplus/fbreader/formats/PluginCollection");
JavaClass AndroidUtil::Class_Paths("org/geometerplus/fbreader/Paths"); JavaClass AndroidUtil::Class_Paths("org/geometerplus/fbreader/Paths");
JavaClass AndroidUtil::Class_Book("org/geometerplus/fbreader/library/Book"); JavaClass AndroidUtil::Class_Book("org/geometerplus/fbreader/book/Book");
JavaClass AndroidUtil::Class_Tag("org/geometerplus/fbreader/library/Tag"); JavaClass AndroidUtil::Class_Tag("org/geometerplus/fbreader/book/Tag");
JavaClass AndroidUtil::Class_NativeBookModel("org/geometerplus/fbreader/bookmodel/NativeBookModel"); JavaClass AndroidUtil::Class_NativeBookModel("org/geometerplus/fbreader/bookmodel/NativeBookModel");
shared_ptr<StringMethod> AndroidUtil::Method_java_lang_String_toLowerCase; shared_ptr<StringMethod> AndroidUtil::Method_java_lang_String_toLowerCase;
@ -178,9 +178,9 @@ bool AndroidUtil::init(JavaVM* jvm) {
Method_Book_setLanguage = new VoidMethod(Class_Book, "setLanguage", "(Ljava/lang/String;)"); Method_Book_setLanguage = new VoidMethod(Class_Book, "setLanguage", "(Ljava/lang/String;)");
Method_Book_setEncoding = new VoidMethod(Class_Book, "setEncoding", "(Ljava/lang/String;)"); Method_Book_setEncoding = new VoidMethod(Class_Book, "setEncoding", "(Ljava/lang/String;)");
Method_Book_addAuthor = new VoidMethod(Class_Book, "addAuthor", "(Ljava/lang/String;Ljava/lang/String;)"); Method_Book_addAuthor = new VoidMethod(Class_Book, "addAuthor", "(Ljava/lang/String;Ljava/lang/String;)");
Method_Book_addTag = new VoidMethod(Class_Book, "addTag", "(Lorg/geometerplus/fbreader/library/Tag;)"); Method_Book_addTag = new VoidMethod(Class_Book, "addTag", "(Lorg/geometerplus/fbreader/book/Tag;)");
StaticMethod_Tag_getTag = new StaticObjectMethod(Class_Tag, "getTag", Class_Tag, "(Lorg/geometerplus/fbreader/library/Tag;Ljava/lang/String;)"); StaticMethod_Tag_getTag = new StaticObjectMethod(Class_Tag, "getTag", Class_Tag, "(Lorg/geometerplus/fbreader/book/Tag;Ljava/lang/String;)");
Field_NativeBookModel_Book = new ObjectField(Class_NativeBookModel, "Book", Class_Book); Field_NativeBookModel_Book = new ObjectField(Class_NativeBookModel, "Book", Class_Book);
Method_NativeBookModel_initInternalHyperlinks = new VoidMethod(Class_NativeBookModel, "initInternalHyperlinks", "(Ljava/lang/String;Ljava/lang/String;I)"); Method_NativeBookModel_initInternalHyperlinks = new VoidMethod(Class_NativeBookModel, "initInternalHyperlinks", "(Ljava/lang/String;Ljava/lang/String;I)");

8
proguard.cfg
View file

@ -68,8 +68,8 @@
-keepclassmembers class org.geometerplus.fbreader.Paths { -keepclassmembers class org.geometerplus.fbreader.Paths {
public static ** cacheDirectory(); public static ** cacheDirectory();
} }
-keep class org.geometerplus.fbreader.library.Book -keep class org.geometerplus.fbreader.book.Book
-keepclassmembers class org.geometerplus.fbreader.library.Book { -keepclassmembers class org.geometerplus.fbreader.book.Book {
public ** File; public ** File;
public ** getTitle(); public ** getTitle();
public ** getLanguage(); public ** getLanguage();
@ -82,8 +82,8 @@
public void addTag(**); public void addTag(**);
public boolean save(); public boolean save();
} }
-keep class org.geometerplus.fbreader.library.Tag -keep class org.geometerplus.fbreader.book.Tag
-keepclassmembers class org.geometerplus.fbreader.library.Tag { -keepclassmembers class org.geometerplus.fbreader.book.Tag {
public static ** getTag(**,**); public static ** getTag(**,**);
} }
-keepclassmembers class org.geometerplus.fbreader.bookmodel.BookModelImpl { -keepclassmembers class org.geometerplus.fbreader.bookmodel.BookModelImpl {