Skip to content

Commit a4a20dc

Browse files
maradomar-v-in
authored andcommitted
do not hardcode the apk path
The apk path is hardcoded, but it is in fact placed inside the build path. This patch changes it, so the apk path is calculated from the build path. This patch does not change any behavior. However, it allows future changes to build path to automaticly reflect on the apk path.
1 parent a808476 commit a4a20dc

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Android.mk

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,19 @@ LOCAL_PACKAGE_NAME := GmsCore
2222
gmscore_root := $(LOCAL_PATH)
2323
gmscore_dir := play-services-core
2424
gmscore_out := $(TARGET_COMMON_OUT_ROOT)/obj/APPS/$(LOCAL_MODULE)_intermediates
25-
gmscore_build := $(gmscore_root)/$(gmscore_dir)/build
26-
gmscore_apk := build/outputs/apk/release/play-services-core-release-unsigned.apk
25+
gmscore_build := $(gmscore_dir)/build
26+
gmscore_apk := $(gmscore_build)/outputs/apk/release/play-services-core-release-unsigned.apk
2727

28-
$(gmscore_root)/$(gmscore_dir)/$(gmscore_apk):
29-
rm -Rf $(gmscore_build)
28+
$(gmscore_root)/$(gmscore_apk):
29+
rm -Rf $(gmscore_root)/$(gmscore_build)
3030
mkdir -p $(ANDROID_BUILD_TOP)/$(gmscore_out)
31-
ln -s $(ANDROID_BUILD_TOP)/$(gmscore_out) $(ANDROID_BUILD_TOP)/$(gmscore_build)
31+
ln -s $(ANDROID_BUILD_TOP)/$(gmscore_out) $(ANDROID_BUILD_TOP)/$(gmscore_root)/$(gmscore_build)
3232
echo "sdk.dir=$(ANDROID_HOME)" > $(gmscore_root)/local.properties
3333
cd $(gmscore_root) && git submodule update --recursive --init
3434
cd $(gmscore_root)/$(gmscore_dir) && JAVA_TOOL_OPTIONS="$(JAVA_TOOL_OPTIONS) -Dfile.encoding=UTF8" ../gradlew assembleRelease
3535

3636
LOCAL_CERTIFICATE := platform
37-
LOCAL_SRC_FILES := $(gmscore_dir)/$(gmscore_apk)
37+
LOCAL_SRC_FILES := $(gmscore_apk)
3838
LOCAL_MODULE_CLASS := APPS
3939
LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
4040

0 commit comments

Comments
 (0)