Update aconfig build
- Ensure that aconfig codegen is consumed locally via visibility
- Rename aconfig files for consistency
- Modularize/reorganize flags by package
- Split framework exposed flags
- Add documentation
Bug: 308062714
Test: Compiles
Change-Id: Ic6b012dc5f34020357d0fb4be749a775b67564cb
diff --git a/media/utils/Android.bp b/media/utils/Android.bp
index 56b11b5..5b7319a 100644
--- a/media/utils/Android.bp
+++ b/media/utils/Android.bp
@@ -84,6 +84,7 @@
"libprocessinfoservice_aidl",
],
shared_libs: [
+ "com.android.media.audio-aconfig-cc",
"libaudioclient_aidl_conversion",
"libaudioutils", // for clock.h, Statistics.h
"libbase",
@@ -93,7 +94,6 @@
"liblog",
"libpermission",
"libutils",
- "aconfig_audio_flags_c_lib",
"android.hardware.graphics.bufferqueue@1.0",
"android.hidl.token@1.0-utils",
"packagemanager_aidl-cpp",
diff --git a/media/utils/ServiceUtilities.cpp b/media/utils/ServiceUtilities.cpp
index 245811b..2946398 100644
--- a/media/utils/ServiceUtilities.cpp
+++ b/media/utils/ServiceUtilities.cpp
@@ -27,7 +27,7 @@
#include <media/AidlConversionUtil.h>
#include <android/content/AttributionSourceState.h>
-#include <com_android_media_audio_flags.h>
+#include <com_android_media_audio.h>
#include <iterator>
#include <algorithm>
#include <pwd.h>
@@ -388,7 +388,7 @@
*/
bool mustAnonymizeBluetoothAddress(
const AttributionSourceState& attributionSource, const String16& caller) {
- if (!com::android::media::audio::flags::bluetooth_mac_address_anonymization()) {
+ if (!com::android::media::audio::bluetooth_mac_address_anonymization()) {
return false;
}