From 74ae4cf7572615be972a3e0aff76c78030834db3 Mon Sep 17 00:00:00 2001 From: Chenming Huang Date: Tue, 5 Apr 2022 10:40:21 +0800 Subject: [PATCH] Android: Avoid LOCAL_PATH conflicts in builds Change the top level Android.mk's LOCAL_PATH to S_LOCAL_PATH to avoid potential LOCAL_PATH conflict in subdirectory's LOCAL_PATH. Signed-off-by: Jouni Malinen --- Android.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Android.mk b/Android.mk index bd7a40974..03d18c5e6 100644 --- a/Android.mk +++ b/Android.mk @@ -1,10 +1,10 @@ -LOCAL_PATH:= $(call my-dir) +S_LOCAL_PATH := $(call my-dir) ifneq ($(filter VER_0_8_X VER_2_1_DEVEL,$(WPA_SUPPLICANT_VERSION)),) # The order of the 2 Android.mks does matter! # TODO: Clean up the Android.mks, reset all the temporary variables at the # end of each Android.mk, so that one Android.mk doesn't depend on variables # set up in the other Android.mk. -include $(LOCAL_PATH)/hostapd/Android.mk \ - $(LOCAL_PATH)/wpa_supplicant/Android.mk +include $(S_LOCAL_PATH)/hostapd/Android.mk \ + $(S_LOCAL_PATH)/wpa_supplicant/Android.mk endif