diff options
| author | Ying Wang <wangying@google.com> | 2012-11-20 18:04:25 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2012-11-20 18:04:25 -0800 |
| commit | 62b90b3f61d96527800b43f3d467e32f06e1e8f1 (patch) | |
| tree | 45896d1a6a630e4301441efaa99b8460a1de988b | |
| parent | de922a387ae4e68dea3345b6ff68361302063731 (diff) | |
| download | android_external_wpa_supplicant_8-62b90b3f61d96527800b43f3d467e32f06e1e8f1.tar.gz android_external_wpa_supplicant_8-62b90b3f61d96527800b43f3d467e32f06e1e8f1.tar.bz2 android_external_wpa_supplicant_8-62b90b3f61d96527800b43f3d467e32f06e1e8f1.zip | |
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
| -rw-r--r-- | Android.mk | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -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 |