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 <quic_jouni@quicinc.com>
This commit is contained in:
parent
5ab3853211
commit
74ae4cf757
1 changed files with 3 additions and 3 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue