diff options
| author | Po Lu <luangruo@yahoo.com> | 2024-04-10 22:33:08 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2024-04-10 22:33:08 +0800 |
| commit | ed88bed3afbc9922f020cf3a8803e08f2811e89b (patch) | |
| tree | d5264a7a60343ca631cee644c1b0c988f56fe175 /java | |
| parent | f2f13fa630bd2658ea3f90c4362fe6201d32e67e (diff) | |
| download | emacs-ed88bed3afbc9922f020cf3a8803e08f2811e89b.tar.gz | |
Optimize generated Android DEX bytecode
* configure.ac (D8): Attempt to locate the bundle where d8 is
installed, detect whether an installation of `r8' is similarly
present, and use this installation in place of d8 if so.
* java/Makefile.in (ANDROID_MIN_SDK, IS_D8_R8): New
substitutions.
(classes.dex): Provide --min-api, --debug or --release and
--pg-conf to d8 or r8.
Diffstat (limited to 'java')
| -rw-r--r-- | java/Makefile.in | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/java/Makefile.in b/java/Makefile.in index c23b52ed44e..daa577467c1 100644 --- a/java/Makefile.in +++ b/java/Makefile.in @@ -98,6 +98,12 @@ JAVA_FILES := $(filter-out $(RESOURCE_FILE),$(JAVA_FILES)) ANDROID_MIN_SDK := @ANDROID_MIN_SDK@ APK_NAME := emacs-$(version)-$(ANDROID_MIN_SDK)-$(ANDROID_ABI).apk +# Whether or not the bundle is to be debuggable. +ANDROID_DEBUGGABLE := @ANDROID_DEBUGGABLE@ + +# Whether or not $(D8) is in fact the name of the `r8' optimizer binary. +IS_D8_R8 := @IS_D8_R8@ + # How this stuff works. # emacs.apk depends on emacs.apk-in, which is simply a ZIP archive @@ -299,10 +305,14 @@ $(CLASS_FILES) &: $(JAVA_FILES) # N.B. that find must be called all over again in case javac generated # nested classes. -classes.dex: $(CLASS_FILES) +classes.dex: $(CLASS_FILES) $(if $(IS_D8_R8), proguard.conf) $(AM_V_D8) $(D8) --classpath $(ANDROID_JAR) \ $(subst $$,\$$,$(shell find $(srcdir) -type f \ - -name *.class)) --output $(builddir) + -name *.class)) --output $(builddir) \ + --min-api $(ANDROID_MIN_SDK) \ + $(if $(filter false,$(ANDROID_DEBUGGABLE)),--release, \ + --debug) \ + $(if $(IS_D8_R8),--pg-conf proguard.conf) # When emacs.keystore expires, regenerate it with: # |