From 51a7b358932bef7d06b67cb4fbed94e93ee888c8 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Thu, 27 Sep 2018 00:36:36 -0700 Subject: [PATCH] Don't conflict with cached local path if included in other Android.mk files --- Android.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Android.mk b/Android.mk index 34ca6d89..10bf7f6e 100644 --- a/Android.mk +++ b/Android.mk @@ -1,4 +1,4 @@ -MY_LOCAL_PATH := $(call my-dir) +SDL_IMAGE_LOCAL_PATH := $(call my-dir) # Enable this if you want to support loading JPEG images @@ -19,22 +19,22 @@ WEBP_LIBRARY_PATH := external/libwebp-0.6.0 # Build the library ifeq ($(SUPPORT_JPG),true) - include $(MY_LOCAL_PATH)/$(JPG_LIBRARY_PATH)/Android.mk + include $(SDL_IMAGE_LOCAL_PATH)/$(JPG_LIBRARY_PATH)/Android.mk endif # Build the library ifeq ($(SUPPORT_PNG),true) - include $(MY_LOCAL_PATH)/$(PNG_LIBRARY_PATH)/Android.mk + include $(SDL_IMAGE_LOCAL_PATH)/$(PNG_LIBRARY_PATH)/Android.mk endif # Build the library ifeq ($(SUPPORT_WEBP),true) - include $(MY_LOCAL_PATH)/$(WEBP_LIBRARY_PATH)/Android.mk + include $(SDL_IMAGE_LOCAL_PATH)/$(WEBP_LIBRARY_PATH)/Android.mk endif # Restore local path -LOCAL_PATH := $(MY_LOCAL_PATH) +LOCAL_PATH := $(SDL_IMAGE_LOCAL_PATH) include $(CLEAR_VARS)