Include the subdir Android.mks in fixed order.

The build fails when the include order is reversed.
On the other hand, the build system doesn't guarantee the file order
returned by all-subdir-makefiles.

Change-Id: I398e536fc8189d0f26ebc0b0342c778d234532ad

diff --git a/Android.mk b/Android.mk
index 20ab1c0..76afb77 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -1,6 +1,13 @@
+LOCAL_PATH:= $(call my-dir)
+
 ifndef WPA_SUPPLICANT_VERSION
 WPA_SUPPLICANT_VERSION := VER_0_8_X
 endif
 ifeq ($(WPA_SUPPLICANT_VERSION),VER_0_8_X)
-    include $(call all-subdir-makefiles)
+# 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
 endif