diff options
| author | Arun Raghavan <arun@arunraghavan.net> | 2017-01-05 10:51:17 +0530 |
|---|---|---|
| committer | Arun Raghavan <arun@arunraghavan.net> | 2017-01-05 11:06:28 +0530 |
| commit | b032a7cbbd6ea2d8a1f41b8ddf7536e559f186db (patch) | |
| tree | c5a125fb6c27415f86278522c9fa066de6002cb1 /data | |
| parent | f7e7cca30213f51aa60edd3ed6d654e82e7df829 (diff) | |
android: Put assets in src/main/assets by default
This seems to be the correct place to put it, and newer versions of
Android Studio don't seem to pick up just assets/.
Also adding a way to customise this for apps that wish to do so (via
the GSTREAMER_ASSETS_DIR variable).
https://bugzilla.gnome.org/show_bug.cgi?id=774728
Diffstat (limited to 'data')
| -rwxr-xr-x | data/ndk-build/gstreamer-1.0.mk | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/data/ndk-build/gstreamer-1.0.mk b/data/ndk-build/gstreamer-1.0.mk index b6cf24ae..99c9e9f7 100755 --- a/data/ndk-build/gstreamer-1.0.mk +++ b/data/ndk-build/gstreamer-1.0.mk @@ -260,12 +260,16 @@ copyjavasource_$(TARGET_ARCH_ABI): $(SED_LOCAL) "s;@INCLUDE_COPY_FILE@;$(GSTREAMER_COPY_FILE_SUBST);g" \ > $(GSTREAMER_JAVA_SRC_DIR)/org/freedesktop/gstreamer/GStreamer.java +ifndef GSTREAMER_ASSETS_DIR +GSTREAMER_ASSETS_DIR := src/main/assets +endif + copyfontsres_$(TARGET_ARCH_ABI): - @$(call host-mkdir,assets/fontconfig) - @$(call host-mkdir,assets/fontconfig/fonts/truetype/) - @$(call host-cp,$(GSTREAMER_NDK_BUILD_PATH)/fontconfig/fonts.conf,assets/fontconfig) - @$(call host-cp,$(GSTREAMER_NDK_BUILD_PATH)/fontconfig/fonts/Ubuntu-R.ttf,assets/fontconfig/fonts/truetype) + @$(call host-mkdir,$(GSTREAMER_ASSETS_DIR)/fontconfig) + @$(call host-mkdir,$(GSTREAMER_ASSETS_DIR)/fontconfig/fonts/truetype/) + @$(call host-cp,$(GSTREAMER_NDK_BUILD_PATH)/fontconfig/fonts.conf,$(GSTREAMER_ASSETS_DIR)/fontconfig) + @$(call host-cp,$(GSTREAMER_NDK_BUILD_PATH)/fontconfig/fonts/Ubuntu-R.ttf,$(GSTREAMER_ASSETS_DIR)/fontconfig/fonts/truetype) copycacertificatesres_$(TARGET_ARCH_ABI): - @$(call host-mkdir,assets/ssl/certs) - @$(call host-cp,$(GSTREAMER_ROOT)/etc/ssl/certs/ca-certificates.crt,assets/ssl/certs) + @$(call host-mkdir,$(GSTREAMER_ASSETS_DIR)/ssl/certs) + @$(call host-cp,$(GSTREAMER_ROOT)/etc/ssl/certs/ca-certificates.crt,$(GSTREAMER_ASSETS_DIR)/ssl/certs) |