diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2024-06-12 11:48:58 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2024-06-12 11:48:58 +0300 |
| commit | 7485d7aef30c572ba29b351e457e8871ee565ad4 (patch) | |
| tree | 1c696e421f762e8b1b75c5f7cb04ef960fb646f6 /java | |
| parent | eb5aafb0f4cf7d2f5f12e2eb3a4324c3d5834db7 (diff) | |
| parent | eee084b1d79689fc49875b544f703ee276976b59 (diff) | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
Diffstat (limited to 'java')
| -rw-r--r-- | java/Makefile.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/java/Makefile.in b/java/Makefile.in index fd076c089ff..8cc2235b9f3 100644 --- a/java/Makefile.in +++ b/java/Makefile.in @@ -258,7 +258,8 @@ install_temp: $(CROSS_BINS) $(CROSS_LIBS) $(RESOURCE_FILES) { hostname; date +%s; } > install_temp/assets/build_info # Produce the file index. $(AM_V_SILENT) $(libsrc)/asset-directory-tool \ - install_temp/assets install_temp/assets/directory-tree + install_temp/assets install_temp/assets/directory-tree\ + $(if $(ANDROID_SDK_8_OR_EARLIER),--api-8) # If the package targets Android 2.2, move compressable and # non-compressable assets to separate directories. $(AM_V_SILENT) \ @@ -266,6 +267,7 @@ install_temp: $(CROSS_BINS) $(CROSS_LIBS) $(RESOURCE_FILES) echo "Moving large and gzipped files to separate directories...">&2;\ mkdir -p install_temp/assets_raw; \ cd install_temp/assets; \ + mv directory-tree ../assets_raw; \ find . \( -size +1536 -o -size 1536 \) \ \( \! -name '*.gz' \) -type f > files.txt; \ tar cf ../assets_raw/largefiles.tar -T files.txt; \ |