Merge v0.7.0 into master.
Adjust Android build system rules for recent changes in upstream
cpu_features.
Test: Run `atest -a --test-mapping external/cpu_features:all` (on
x86-64 and Arm64 devices)
Change-Id: Idd78a3a4f29247b2c83117bde98cca45f94908f2
diff --git a/Android.bp b/Android.bp
index 7f70060..57e3804 100644
--- a/Android.bp
+++ b/Android.bp
@@ -101,7 +101,7 @@
arch: {
arm: {
srcs: [
- "src/cpuinfo_arm.c",
+ "src/impl_arm_linux_or_android.c",
],
whole_static_libs: [
"libcpu_features-hwcaps",
@@ -109,7 +109,7 @@
},
arm64: {
srcs: [
- "src/cpuinfo_aarch64.c",
+ "src/impl_aarch64_linux_or_android.c",
],
whole_static_libs: [
"libcpu_features-hwcaps",
@@ -120,7 +120,7 @@
},
x86: {
srcs: [
- "src/cpuinfo_x86.c",
+ "src/impl_x86_linux_or_android.c",
],
cflags: [
"-Wno-unused-variable",
@@ -128,7 +128,7 @@
},
x86_64: {
srcs: [
- "src/cpuinfo_x86.c",
+ "src/impl_x86_linux_or_android.c",
],
cflags: [
"-Wno-unused-variable",
@@ -171,6 +171,16 @@
"-Wno-unused-function",
],
},
+ x86: {
+ cflags: [
+ "-Wno-deprecated-declarations",
+ ],
+ },
+ x86_64: {
+ cflags: [
+ "-Wno-deprecated-declarations",
+ ],
+ },
},
}
@@ -334,26 +344,28 @@
cflags: [
"-DCPU_FEATURES_MOCK_CPUID_X86",
"-Wno-unused-variable",
+ "-Wno-deprecated-declarations",
],
srcs: [
"test/cpuinfo_x86_test.cc",
- "src/cpuinfo_x86.c",
+ "src/impl_x86_linux_or_android.c",
],
},
x86_64: {
cflags: [
"-DCPU_FEATURES_MOCK_CPUID_X86",
"-Wno-unused-variable",
+ "-Wno-deprecated-declarations",
],
srcs: [
"test/cpuinfo_x86_test.cc",
- "src/cpuinfo_x86.c",
+ "src/impl_x86_linux_or_android.c",
],
},
arm: {
srcs: [
"test/cpuinfo_arm_test.cc",
- "src/cpuinfo_arm.c",
+ "src/impl_arm_linux_or_android.c",
],
},
arm64: {
@@ -362,7 +374,7 @@
],
srcs: [
"test/cpuinfo_aarch64_test.cc",
- "src/cpuinfo_aarch64.c",
+ "src/impl_aarch64_linux_or_android.c",
],
},
},
