Don't conflict with cached local path if included in other Android.mk files
authorSam Lantinga <slouken@libsdl.org>
Thu, 27 Sep 2018 00:36:36 -0700
changeset 588960662a9dbdc
parent 587 32a18ca05935
child 589 de1b4449f8a6
Don't conflict with cached local path if included in other Android.mk files
Android.mk
     1.1 --- a/Android.mk	Wed Sep 26 15:19:34 2018 -0400
     1.2 +++ b/Android.mk	Thu Sep 27 00:36:36 2018 -0700
     1.3 @@ -1,4 +1,4 @@
     1.4 -MY_LOCAL_PATH := $(call my-dir)
     1.5 +SDL_IMAGE_LOCAL_PATH := $(call my-dir)
     1.6  
     1.7  
     1.8  # Enable this if you want to support loading JPEG images
     1.9 @@ -19,22 +19,22 @@
    1.10  
    1.11  # Build the library
    1.12  ifeq ($(SUPPORT_JPG),true)
    1.13 -    include $(MY_LOCAL_PATH)/$(JPG_LIBRARY_PATH)/Android.mk
    1.14 +    include $(SDL_IMAGE_LOCAL_PATH)/$(JPG_LIBRARY_PATH)/Android.mk
    1.15  endif
    1.16  
    1.17  # Build the library
    1.18  ifeq ($(SUPPORT_PNG),true)
    1.19 -    include $(MY_LOCAL_PATH)/$(PNG_LIBRARY_PATH)/Android.mk
    1.20 +    include $(SDL_IMAGE_LOCAL_PATH)/$(PNG_LIBRARY_PATH)/Android.mk
    1.21  endif
    1.22  
    1.23  # Build the library
    1.24  ifeq ($(SUPPORT_WEBP),true)
    1.25 -    include $(MY_LOCAL_PATH)/$(WEBP_LIBRARY_PATH)/Android.mk
    1.26 +    include $(SDL_IMAGE_LOCAL_PATH)/$(WEBP_LIBRARY_PATH)/Android.mk
    1.27  endif
    1.28  
    1.29  
    1.30  # Restore local path
    1.31 -LOCAL_PATH := $(MY_LOCAL_PATH)
    1.32 +LOCAL_PATH := $(SDL_IMAGE_LOCAL_PATH)
    1.33  
    1.34  include $(CLEAR_VARS)
    1.35