diff options
| author | Po Lu | 2024-04-10 23:22:38 +0800 |
|---|---|---|
| committer | Po Lu | 2024-04-10 23:22:38 +0800 |
| commit | 15bafc04322e9c4e85a00fe593239935eb723b6e (patch) | |
| tree | 5d0cb81420d67cbc700ddf3ce71c85383507fcb4 /java/Makefile.in | |
| parent | 0bfc1d4e7eedb8496a293cf51c2b731a43c2010e (diff) | |
| download | emacs-15bafc04322e9c4e85a00fe593239935eb723b6e.tar.gz emacs-15bafc04322e9c4e85a00fe593239935eb723b6e.zip | |
* java/Makefile.in (classes.dex): Make proguard.conf relative to srcdir.
Diffstat (limited to 'java/Makefile.in')
| -rw-r--r-- | java/Makefile.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/Makefile.in b/java/Makefile.in index daa577467c1..186194fb6ac 100644 --- a/java/Makefile.in +++ b/java/Makefile.in | |||
| @@ -305,14 +305,14 @@ $(CLASS_FILES) &: $(JAVA_FILES) | |||
| 305 | # N.B. that find must be called all over again in case javac generated | 305 | # N.B. that find must be called all over again in case javac generated |
| 306 | # nested classes. | 306 | # nested classes. |
| 307 | 307 | ||
| 308 | classes.dex: $(CLASS_FILES) $(if $(IS_D8_R8), proguard.conf) | 308 | classes.dex: $(CLASS_FILES) $(if $(IS_D8_R8), $(srcdir)/proguard.conf) |
| 309 | $(AM_V_D8) $(D8) --classpath $(ANDROID_JAR) \ | 309 | $(AM_V_D8) $(D8) --classpath $(ANDROID_JAR) \ |
| 310 | $(subst $$,\$$,$(shell find $(srcdir) -type f \ | 310 | $(subst $$,\$$,$(shell find $(srcdir) -type f \ |
| 311 | -name *.class)) --output $(builddir) \ | 311 | -name *.class)) --output $(builddir) \ |
| 312 | --min-api $(ANDROID_MIN_SDK) \ | 312 | --min-api $(ANDROID_MIN_SDK) \ |
| 313 | $(if $(filter false,$(ANDROID_DEBUGGABLE)),--release, \ | 313 | $(if $(filter false,$(ANDROID_DEBUGGABLE)),--release, \ |
| 314 | --debug) \ | 314 | --debug) \ |
| 315 | $(if $(IS_D8_R8),--pg-conf proguard.conf) | 315 | $(if $(IS_D8_R8),--pg-conf $(srcdir)/proguard.conf) |
| 316 | 316 | ||
| 317 | # When emacs.keystore expires, regenerate it with: | 317 | # When emacs.keystore expires, regenerate it with: |
| 318 | # | 318 | # |