tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "audio: Support 64bit configuration on 32+64bit compatible OS" am: f665b8fa86 am: 66cfe34ef4 am: 0e98137981

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1891181

Change-Id: I636d282b4bc1695ba05da24fd96b8b546594c28a
This commit is contained in:
Carter Hsu 2021-11-17 05:54:29 +00:00 committed by Automerger Merge Worker
commit e3d00ca753
1 changed files with 32 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
audio/common/all-versions/default/service/Android.bp
View file

@ -7,17 +7,40 @@ package {
default_applicable_licenses: ["hardware_interfaces_license"], default_applicable_licenses: ["hardware_interfaces_license"],
} }
soong_config_module_type {
name: "android_hardware_audio_config_default",
module_type: "cc_defaults",
config_namespace: "android_hardware_audio",
bool_variables: [
"run_64bit",
],
properties: ["compile_multilib"],
}
android_hardware_audio_config_default {
name: "android_hardware_audio_config_defaults",
soong_config_variables: {
run_64bit: {
conditions_default: {
// Prefer 32 bit as the binary must always be installed at the same
// location for init to start it and the build system does not support
// having two binaries installable to the same location even if they are
// not installed in the same build.
compile_multilib: "prefer32",
},
compile_multilib: "64",
},
},
}
cc_binary { cc_binary {
name: "android.hardware.audio.service", name: "android.hardware.audio.service",
init_rc: ["android.hardware.audio.service.rc"], init_rc: ["android.hardware.audio.service.rc"],
relative_install_path: "hw", relative_install_path: "hw",
vendor: true, vendor: true,
// Prefer 32 bit as the binary must always be installed at the same
// location for init to start it and the build system does not support
// having two binaries installable to the same location even if they are
// not installed in the same build.
compile_multilib: "prefer32",
srcs: ["service.cpp"], srcs: ["service.cpp"],
cflags: [ cflags: [
@ -34,6 +57,10 @@ cc_binary {
"libutils", "libutils",
"libhardware", "libhardware",
], ],
defaults: [
"android_hardware_audio_config_defaults",
],
} }
// Legacy service name, use android.hardware.audio.service instead // Legacy service name, use android.hardware.audio.service instead