AOSP: Top level Android.mk changes

These are from number of AOSP commits:

commit 3f2a11702f53c1bd867041b2320f6adc536aee9f
Author: Dmitry Shmidt <dimitrysh@google.com>
Date:   Wed Nov 7 12:58:02 2012 -0800

    wpa_supplicant: Set Ver 0.8.X as default

    Change-Id: I2d2433464068e863c12c0a06eed269e2a8c0fc46
    Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
commit 62b90b3f61d96527800b43f3d467e32f06e1e8f1
Author: Ying Wang <wangying@google.com>
Date:   Tue Nov 20 18:04:25 2012 -0800

    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

etc.

diff --git a/Android.mk b/Android.mk
index c2cc68b5d466fe440a7bd46ad9db62f9384dc40d..4a74b248d5b1265ec1b4d8eb6c4fed410fbd2747 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -1,3 +1,16 @@
+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)
+# 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
 ifeq ($(WPA_SUPPLICANT_VERSION),VER_2_1_DEVEL)
-    include $(call all-subdir-makefiles)
+include $(call all-subdir-makefiles)
 endif