Merge "Add hostapd utility"
diff --git a/core/shared_library.mk b/core/shared_library.mk
index 47a089a..ca639eb 100644
--- a/core/shared_library.mk
+++ b/core/shared_library.mk
@@ -31,8 +31,12 @@
my_target_crtbegin_so_o := $(TARGET_CRTBEGIN_SO_O)
my_target_crtend_so_o := $(TARGET_CRTEND_SO_O)
ifdef LOCAL_NDK_VERSION
-my_target_global_ld_dirs += $(addprefix -L, $(patsubst %/,%,$(dir $(my_ndk_stl_shared_lib_fullpath))) \
- $(my_ndk_version_root)/usr/lib)
+# Make sure the prebuilt NDK paths are put ahead of the TARGET_GLOBAL_LD_DIRS,
+# so we don't have race condition when the system libraries (such as libc, libstdc++) are also built in the tree.
+my_target_global_ld_dirs := \
+ $(addprefix -L, $(patsubst %/,%,$(dir $(my_ndk_stl_shared_lib_fullpath))) \
+ $(my_ndk_version_root)/usr/lib) \
+ $(my_target_global_ld_dirs)
my_target_global_ldflags := $(my_ndk_stl_shared_lib) $(my_target_global_ldflags)
my_target_crtbegin_so_o := $(wildcard $(my_ndk_version_root)/usr/lib/crtbegin_so.o)
my_target_crtend_so_o := $(wildcard $(my_ndk_version_root)/usr/lib/crtend_so.o)
diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index 7e470b9..d942cde 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -59,7 +59,8 @@
jsr305lib \
jython \
jsilver \
- librs_jni
+ librs_jni \
+ ConnectivityTest
# Host tools that are parts of the SDK.