From 9c060f9c3e48b69e44bc9d91c79f9a05d7e29410 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Wed, 10 Apr 2024 23:22:38 +0800 Subject: [PATCH] * java/Makefile.in (classes.dex): Make proguard.conf relative to srcdir. (cherry picked from commit 15bafc04322e9c4e85a00fe593239935eb723b6e) --- java/Makefile.in | 4 ++-- 1 file 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) # N.B. that find must be called all over again in case javac generated # nested classes. -classes.dex: $(CLASS_FILES) $(if $(IS_D8_R8), proguard.conf) +classes.dex: $(CLASS_FILES) $(if $(IS_D8_R8), $(srcdir)/proguard.conf) $(AM_V_D8) $(D8) --classpath $(ANDROID_JAR) \ $(subst $$,\$$,$(shell find $(srcdir) -type f \ -name *.class)) --output $(builddir) \ --min-api $(ANDROID_MIN_SDK) \ $(if $(filter false,$(ANDROID_DEBUGGABLE)),--release, \ --debug) \ - $(if $(IS_D8_R8),--pg-conf proguard.conf) + $(if $(IS_D8_R8),--pg-conf $(srcdir)/proguard.conf) # When emacs.keystore expires, regenerate it with: # -- 2.39.5