Introduce avf_build_flags_cc cc_defaults
These are similar to avf_build_rust_build flags, but for cc_* soong
modules.
In the immediate future this will be used for flag guarding
virtcpu-freq related changes to platform.dts.
This patch also adds avf_build_flags_cc as cc_defaults to all our
existing cc_* soong modules
Test: builds
Bug: 284369518
Change-Id: I19152675802548cd9efba30a40bccdbb14867fe1
diff --git a/tests/benchmark/Android.bp b/tests/benchmark/Android.bp
index 31fe0f6..c31c929 100644
--- a/tests/benchmark/Android.bp
+++ b/tests/benchmark/Android.bp
@@ -34,6 +34,7 @@
cc_library_shared {
name: "MicrodroidBenchmarkNativeLib",
+ defaults: ["avf_build_flags_cc"],
srcs: ["src/native/*.cpp"],
local_include_dirs: ["src/native/include"],
static_libs: [
diff --git a/tests/benchmark/src/jni/Android.bp b/tests/benchmark/src/jni/Android.bp
index c2e1b7c..06de3e5 100644
--- a/tests/benchmark/src/jni/Android.bp
+++ b/tests/benchmark/src/jni/Android.bp
@@ -5,6 +5,7 @@
cc_library_shared {
name: "libiovsock_host_jni",
+ defaults: ["avf_build_flags_cc"],
srcs: ["io_vsock_host_jni.cpp"],
header_libs: ["jni_headers"],
shared_libs: ["libbase"],
diff --git a/tests/testapk/Android.bp b/tests/testapk/Android.bp
index 10bbfb4..86172b0 100644
--- a/tests/testapk/Android.bp
+++ b/tests/testapk/Android.bp
@@ -68,6 +68,7 @@
// (MicrodroidTestApp) can start a payload defined in the another app (MicrodroidVmShareApp).
cc_defaults {
name: "MicrodroidTestNativeLibDefaults",
+ defaults: ["avf_build_flags_cc"],
srcs: ["src/native/testbinary.cpp"],
stl: "libc++_static",
header_libs: ["vm_payload_restricted_headers"],
@@ -99,12 +100,14 @@
cc_library_shared {
name: "MicrodroidTestNativeLibSub",
+ defaults: ["avf_build_flags_cc"],
srcs: ["src/native/testlib.cpp"],
stl: "libc++_static",
}
cc_library_shared {
name: "MicrodroidIdleNativeLib",
+ defaults: ["avf_build_flags_cc"],
srcs: ["src/native/idlebinary.cpp"],
header_libs: ["vm_payload_headers"],
stl: "libc++_static",
@@ -113,6 +116,7 @@
// An empty payload missing AVmPayload_main
cc_library_shared {
name: "MicrodroidEmptyNativeLib",
+ defaults: ["avf_build_flags_cc"],
srcs: ["src/native/emptybinary.cpp"],
stl: "none",
}
@@ -120,6 +124,7 @@
// A payload that exits immediately on start
cc_library_shared {
name: "MicrodroidExitNativeLib",
+ defaults: ["avf_build_flags_cc"],
srcs: ["src/native/exitbinary.cpp"],
header_libs: ["vm_payload_headers"],
stl: "libc++_static",
@@ -128,6 +133,7 @@
// A payload which tries to link against libselinux, one of private libraries
cc_library_shared {
name: "MicrodroidPrivateLinkingNativeLib",
+ defaults: ["avf_build_flags_cc"],
srcs: ["src/native/idlebinary.cpp"],
header_libs: ["vm_payload_headers"],
// HACK: linking against "libselinux" will embed libselinux.so into the apk
@@ -139,6 +145,7 @@
// A payload that crashes immediately on start
cc_library_shared {
name: "MicrodroidCrashNativeLib",
+ defaults: ["avf_build_flags_cc"],
srcs: ["src/native/crashbinary.cpp"],
header_libs: ["vm_payload_headers"],
stl: "libc++_static",