Merge changes Ic355174a,I8b04ba9e,I3fefb13c
* changes:
libhardware_legacy: Android.mk -> Android.bp
remove legacy audio policy
libhardware_legacy doesn't need libmedia
diff --git a/Android.bp b/Android.bp
index 3b733f7..d3a3a9c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -18,6 +18,7 @@
srcs: ["power.c"],
export_include_dirs: ["include"],
shared_libs: ["libcutils", "liblog"],
+ vendor_available: true,
}
cc_library_shared {
diff --git a/include/hardware_legacy/gscan.h b/include/hardware_legacy/gscan.h
index 372f2bd..d5d8b9c 100644
--- a/include/hardware_legacy/gscan.h
+++ b/include/hardware_legacy/gscan.h
@@ -3,6 +3,16 @@
#ifndef __WIFI_HAL_GSCAN_H__
#define __WIFI_HAL_GSCAN_H__
+// Define static_assert() unless already defined by compiler.
+#ifndef __has_feature
+ #define __has_feature(__x) 0
+#endif
+#if !(__has_feature(cxx_static_assert)) && !defined(static_assert)
+ #define static_assert(__b, __m) \
+ extern int compile_time_assert_failed[ ( __b ) ? 1 : -1 ] \
+ __attribute__( ( unused ) );
+#endif
+
/* AP Scans */
typedef enum {
