Merge branch 'cm-build' into 'master'

fix paths in Android.mk

It turned out i only tested the build with an outdated source tree so the last commit (38c25f0ecce48ef9cfe5b0b41956ac9a4e2047fd) broke the Android.mk build. Sorry for that.

See merge request !86
This commit is contained in:
Daniel Martí 2015-05-14 23:07:58 +00:00
commit f65824857c

View File

@ -6,14 +6,15 @@ LOCAL_MODULE := F-Droid
LOCAL_MODULE_TAGS := optional
LOCAL_PACKAGE_NAME := F-Droid
fdroid_dir := $(LOCAL_PATH)/F-Droid
fdroid_apk := build/outputs/apk/F-Droid-release-unsigned.apk
fdroid_root := $(LOCAL_PATH)
fdroid_dir := F-Droid
fdroid_apk := build/outputs/apk/F-Droid-release-unsigned.apk
$(LOCAL_PATH)/$(fdroid_apk):
cd $(fdroid_dir) && gradle assembleRelease
$(fdroid_root)/$(fdroid_dir)/$(fdroid_apk):
cd $(fdroid_root)/$(fdroid_dir) && gradle assembleRelease
LOCAL_CERTIFICATE := platform
LOCAL_SRC_FILES := $(fdroid_apk)
LOCAL_SRC_FILES := $(fdroid_dir)/$(fdroid_apk)
LOCAL_MODULE_CLASS := APPS
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)