WIP: Android R8 fixes to enable optimizations #2727

pastk · 2022-06-12T23:37:59Z

biodranik commented

2022-06-12 23:37:59 +00:00

(Migrated from github.com)

@pastk Надо допилить этот PR, хорошо его тестируя на ./gradlew runFDroidBeta

@pastk Надо допилить этот PR, хорошо его тестируя на `./gradlew runFDroidBeta`

pastk reviewed 2022-06-13 12:00:23 +00:00

android/proguard-mwm.txt

pastk commented

2022-06-13 11:54:35 +00:00

Please link to https://developer.android.com/studio/build/shrink-code#keep-code for more details.

android/src/com/mapswithme/maps/MwmActivity.java

pastk commented

2022-06-13 11:48:16 +00:00

our current code style is to wrap method annotations always, i.e. keep each annotation on its own line

android/src/com/mapswithme/maps/api/ParsedSearchRequest.java

					
				@ -9,3 +10,3 @@

				 */

				@Keep

				public final class ParsedSearchRequest

pastk commented

2022-06-13 11:58:24 +00:00

Maybe add //Called from JNI. for all these cases?
Its a very important annotation and an extra reminder why is it there will be very good I think.

Maybe add `//Called from JNI.` for all these cases? Its a very important annotation and an extra reminder why is it there will be very good I think.

biodranik (Migrated from github.com) reviewed 2022-06-13 21:47:45 +00:00

android/src/com/mapswithme/maps/MwmActivity.java

biodranik (Migrated from github.com) commented

2022-06-13 21:47:45 +00:00

I don't like it, but ok. Can you help?

biodranik (Migrated from github.com) reviewed 2022-06-13 21:47:54 +00:00

android/proguard-mwm.txt

biodranik (Migrated from github.com) commented

2022-06-13 21:47:54 +00:00

Can you please help?

biodranik (Migrated from github.com) reviewed 2022-06-13 21:48:32 +00:00

android/src/com/mapswithme/maps/api/ParsedSearchRequest.java

					
				@ -9,3 +10,3 @@

				 */

				@Keep

				public final class ParsedSearchRequest

biodranik (Migrated from github.com) commented

2022-06-13 21:48:32 +00:00

We don't use reflection, so @Keep is the obvious way to mark all JNI calls. The KISS principle.

We don't use reflection, so `@Keep` is the obvious way to mark all JNI calls. The KISS principle.

pastk reviewed 2022-06-14 09:16:30 +00:00

android/src/com/mapswithme/maps/MwmActivity.java

pastk commented

2022-06-14 09:16:29 +00:00

You can use "Reformat file" - "Only VCS changed lines" in AS.

pastk reviewed 2022-06-14 09:19:58 +00:00

android/proguard-mwm.txt

pastk commented

2022-06-14 09:19:58 +00:00

# being manually added as -keep in this file, for details see https://developer.android.com/studio/build/shrink-code#keep-code

```suggestion # being manually added as -keep in this file, for details see https://developer.android.com/studio/build/shrink-code#keep-code ```

pastk commented

2022-06-14 21:54:45 +00:00

We need to add -dontobfuscate
otherwise logs look like this

2022-06-15 00:25:07.740 I/t9.b0: Begin scanning storages
2022-06-15 00:25:07.759 I/t9.b0: Accepted /storage/sdcard/Android/data/app.organicmaps.beta/files/ - currently configured, external, 372037632 available of 534761472 bytes, state=mounted
2022-06-15 00:25:07.760 I/t9.b0: Accepted /data/data/app.organicmaps.beta/files/ - internal, 466739200 available of 1023303680 bytes
2022-06-15 00:25:07.760 I/t9.b0: End scanning storages
2022-06-15 00:25:07.764 E/t9.b0: IOException: 
    java.io.IOException: Test
        at t9.b0.n(SourceFile:92)
        at t9.b0.g(SourceFile)
        at com.mapswithme.maps.MwmApplication.m(SourceFile)
        at com.mapswithme.maps.MwmApplication.j(SourceFile)
        at com.mapswithme.maps.SplashActivity.K0(SourceFile:4)
        at com.mapswithme.maps.SplashActivity.t1(SourceFile)
        at com.mapswithme.maps.SplashActivity$a.run(SourceFile)
        at android.os.Handler.handleCallback(Handler.java:739)
        at android.os.Handler.dispatchMessage(Handler.java:95)
...

But it could be used to find methods and classes which are called from JNI :)
(with obfuscation jni can't find them anymore because their names had been changed)

We need to add `-dontobfuscate` otherwise logs look like this ``` 2022-06-15 00:25:07.740 I/t9.b0: Begin scanning storages 2022-06-15 00:25:07.759 I/t9.b0: Accepted /storage/sdcard/Android/data/app.organicmaps.beta/files/ - currently configured, external, 372037632 available of 534761472 bytes, state=mounted 2022-06-15 00:25:07.760 I/t9.b0: Accepted /data/data/app.organicmaps.beta/files/ - internal, 466739200 available of 1023303680 bytes 2022-06-15 00:25:07.760 I/t9.b0: End scanning storages 2022-06-15 00:25:07.764 E/t9.b0: IOException: java.io.IOException: Test at t9.b0.n(SourceFile:92) at t9.b0.g(SourceFile) at com.mapswithme.maps.MwmApplication.m(SourceFile) at com.mapswithme.maps.MwmApplication.j(SourceFile) at com.mapswithme.maps.SplashActivity.K0(SourceFile:4) at com.mapswithme.maps.SplashActivity.t1(SourceFile) at com.mapswithme.maps.SplashActivity$a.run(SourceFile) at android.os.Handler.handleCallback(Handler.java:739) at android.os.Handler.dispatchMessage(Handler.java:95) ... ``` But it could be used to find methods and classes which are called from JNI :) (with obfuscation jni can't find them anymore because their names had been changed)

pastk commented

2022-06-19 19:32:29 +00:00

The app starts now, but needs more testing to fix more crashes (I tested it very briefly so far).

Fdroid beta x86_64 apk is reduced by 1.7Mb :)

The app starts now, but needs more testing to fix more crashes (I tested it very briefly so far). Fdroid beta x86_64 apk is reduced by 1.7Mb :)

biodranik commented

2022-06-19 21:23:58 +00:00

(Migrated from github.com)

Do you have actions access to run the android beta on your branch?

rtsisyk reviewed 2022-07-17 09:39:18 +00:00

android/proguard-mwm.txt

					
				@ -36,3 +8,1 @@

				-dontwarn androidx.**

				-keep class androidx.** { *; }

				-keep interface androidx.** { *; }

				# TODO: ATM leads to a build failure with an ERROR:R8: java.lang.NullPointerException

rtsisyk commented

2022-07-17 09:39:17 +00:00

What is the purpose of this patch?

biodranik (Migrated from github.com) reviewed 2022-07-18 22:45:38 +00:00

android/proguard-mwm.txt

					
				@ -36,3 +8,1 @@

				-dontwarn androidx.**

				-keep class androidx.** { *; }

				-keep interface androidx.** { *; }

				# TODO: ATM leads to a build failure with an ERROR:R8: java.lang.NullPointerException

biodranik (Migrated from github.com) commented

2022-07-18 22:45:38 +00:00

To enable Java code optimizations and shrinking.

rtsisyk reviewed 2022-10-16 14:07:51 +00:00

3party/opening_hours/opening_hours.cpp

					
				@ -24,1 +24,4 @@

				#ifdef __clang__

				#pragma clang diagnostic push

				#pragma clang diagnostic ignored "-Wdeprecated-copy"

rtsisyk commented

2022-10-16 14:00:28 +00:00

Why is this warning suppressed? Is it related to this patch?

android/proguard-mwm.txt

					
				@ -11,2 +5,3 @@

				-keep class * implements com.mapswithme.util.Gsonable

				# Don't obfuscate to keep logs readable

				-dontobfuscate

rtsisyk commented

2022-10-16 14:01:22 +00:00

This was an old support library we don't use anymore.

android/proguard-mwm.txt

rtsisyk commented

2022-10-16 14:05:37 +00:00

Are you sure here? This namespace is still used by app.

android/proguard-mwm.txt

rtsisyk commented

2022-10-16 14:04:51 +00:00

Are you sure here? This namespace is still used by app.

android/src/com/mapswithme/maps/MwmActivity.java

rtsisyk commented

2022-10-16 14:01:53 +00:00

Could you please keep annotations on new lines to follow existing convention in the code?

android/src/com/mapswithme/maps/bookmarks/data/Bookmark.java

rtsisyk commented

2022-10-16 14:03:22 +00:00

keep annotations on a separate line

This repo is archived. You cannot comment on pull requests.

No reviewers

No labels

Android Automotive (AAOS)

API

AppGallery

AppStore

Battery and Performance

External Map Datasets

F-Droid

Fonts

Frequently User Reported

No milestone

No project

No assignees

3 participants

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: organicmaps/organicmaps-tmp#2727

Rows
Columns