Merge v0.5.0 into master.
Test: . build/envsetup.sh && lunch aosp_arm-eng && mmma external/cpu_features
Test: . build/envsetup.sh && lunch aosp_arm64-eng && mmma external/cpu_features
Test: . build/envsetup.sh && lunch aosp_x86-eng && mmma external/cpu_features
Test: . build/envsetup.sh && lunch aosp_x86_64-eng && mmma external/cpu_features
Test: atest --test-mapping external/cpu_features:all
Bug: 128901000
Change-Id: I9f844c0eba3cff2839fa8985277c67dd8fba90fd
diff --git a/Android.bp b/Android.bp
index c7569de..7632103 100644
--- a/Android.bp
+++ b/Android.bp
@@ -115,6 +115,21 @@
static_libs: [
"libcpu_features",
],
+ arch: {
+ // Function `AddCacheInfo` in `src/utils/list_cpu_features.c` is only used on x86/x86_64 and
+ // triggers an error with `-Werror and `-Wunused-function` on other architectures; disable
+ // the latter flag to avoid compilation errors on those architectures.
+ arm: {
+ cflags: [
+ "-Wno-unused-function",
+ ],
+ },
+ arm64: {
+ cflags: [
+ "-Wno-unused-function",
+ ],
+ },
+ },
}
// Tests.