Rockbox open source high quality audio player as a Music Player Daemon
mpris
rockbox
mpd
libadwaita
audio
rust
zig
deno
Android: Allow "out-of-tree" builds (outside of android/, e.g. build-android/).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27988 a1c6a512-1295-4272-9138-f99709370657
+20
-8
+20
-8
android/android.make
+20
-8
android/android.make
···
17
17
PACKAGE=org.rockbox
18
18
PACKAGE_PATH=org/rockbox
19
19
ANDROID_DIR=$(ROOTDIR)/android
20
+
BINLIB_DIR=$(BUILDDIR)/libs/armeabi
20
21
21
22
22
23
java2class = $(addsuffix .class,$(basename $(subst $(ANDROID_DIR),$(BUILDDIR),$(1))))
···
38
39
JAVA_SRC := $(wildcard $(ANDROID_DIR)/src/$(PACKAGE_PATH)/*.java)
39
40
JAVA_OBJ := $(call java2class,$(subst /src/,/bin/,$(JAVA_SRC)))
40
41
41
-
LIBS := $(BUILDDIR)/libs/armeabi/$(BINARY) $(BUILDDIR)/libs/armeabi/libmisc.so
42
+
LIBS := $(BINLIB_DIR)/$(BINARY) $(BINLIB_DIR)/libmisc.so
42
43
TEMP_APK := $(BUILDDIR)/bin/_Rockbox.apk
44
+
TEMP_APK2 := $(BUILDDIR)/bin/__Rockbox.apk
43
45
APK := $(BUILDDIR)/bin/Rockbox.apk
44
46
47
+
_DIRS := $(BUILDDIR)/___/$(PACKAGE_PATH)
48
+
DIRS := $(subst ___,bin,$(_DIRS))
49
+
DIRS += $(subst ___,gen,$(_DIRS))
50
+
DIRS += $(subst ___,data,$(_DIRS))
51
+
DIRS += $(BUILDDIR)/libs/armeabi
52
+
45
53
$(R_JAVA): $(MANIFEST)
46
54
$(call PRINTS,AAPT $(subst $(BUILDDIR)/,,$<))$(AAPT) package -f -m -J $(BUILDDIR)/gen -M $(MANIFEST) -S $(ANDROID_DIR)/res -I $(ANDROID_PLATFORM)/android.jar -F $(BUILDDIR)/bin/resources.ap_
47
55
48
56
$(BUILDDIR)/bin/$(PACKAGE_PATH)/R.class: $(R_JAVA)
49
-
$(call PRINTS,JAVAC $(subst $(BUILDDIR)/,,$<))javac -d $(BUILDDIR)/bin \
57
+
$(call PRINTS,JAVAC $(subst $(ROOTDIR)/,,$<))javac -d $(BUILDDIR)/bin \
50
58
-classpath $(ANDROID_PLATFORM)/android.jar:$(BUILDDIR)/bin -sourcepath \
51
59
$(ANDROID_DIR)/gen:$(ANDROID_DIR)/src $<
52
60
53
61
$(BUILDDIR)/bin/$(PACKAGE_PATH)/%.class: $(ANDROID_DIR)/src/$(PACKAGE_PATH)/%.java
54
-
$(call PRINTS,JAVAC $(subst $(BUILDDIR)/,,$<))javac -d $(BUILDDIR)/bin \
62
+
$(call PRINTS,JAVAC $(subst $(ROOTDIR)/,,$<))javac -d $(BUILDDIR)/bin \
55
63
-classpath $(ANDROID_PLATFORM)/android.jar:$(BUILDDIR)/bin -sourcepath \
56
64
$(ANDROID_DIR)/gen:$(ANDROID_DIR)/src $<
57
65
···
62
70
63
71
dex: $(BUILDDIR)/bin/classes.dex
64
72
65
-
$(BUILDDIR)/libs/armeabi/$(BINARY): $(BUILDDIR)/$(BINARY)
73
+
$(BINLIB_DIR)/$(BINARY): $(BUILDDIR)/$(BINARY)
66
74
$(call PRINTS,CP $(BINARY))cp $^ $@
67
75
68
76
$(BUILDDIR)/_rockbox.zip: zip
69
77
$(SILENT)mv $(BUILDDIR)/rockbox.zip $@
70
78
71
-
$(BUILDDIR)/libs/armeabi/libmisc.so: $(BUILDDIR)/_rockbox.zip
79
+
$(BINLIB_DIR)/libmisc.so: $(BUILDDIR)/_rockbox.zip
72
80
$(call PRINTS,CP rockbox.zip)cp $^ $@
73
81
74
82
libs: $(LIBS)
···
81
89
$(SILENT)rm -f $@
82
90
$(call PRINTS,SIGN $(subst $(BUILDDIR)/,,$@))jarsigner \
83
91
-keystore "$(HOME)/.android/debug.keystore" -storepass "android" \
84
-
-keypass "android" -signedjar bin/__Rockbox.apk $^ "androiddebugkey"
85
-
$(SILENT)$(ZIPALIGN) -v 4 bin/__Rockbox.apk $@ > /dev/null
92
+
-keypass "android" -signedjar $(TEMP_APK2) $^ "androiddebugkey"
93
+
$(SILENT)$(ZIPALIGN) -v 4 $(TEMP_APK2) $@ > /dev/null
94
+
$(SILENT)rm $(TEMP_APK) $(TEMP_APK2)
86
95
87
-
apk: $(APK)
96
+
dirs:
97
+
$(SILENT)mkdir -p $(DIRS)
98
+
99
+
apk: dirs $(APK)