From b5dd44bc7c5a07c0e413cb13e5706538ad645f03 Mon Sep 17 00:00:00 2001 From: Ronish Kalia Date: Wed, 14 Feb 2024 14:32:32 +0000 Subject: [PATCH] [DON'T BLOCK] Test ownership migration rules This CL is created as a best effort to migrate test targets to the new android ownership model. If you find incorrect or unnecessary attribution in this CL, please create a separate CL to fix that. For more details please refer to the link below, Bug: 304529413 Test: N/A Change-Id: I6bc538dec03600aa3a7f7075209e031f2826baff --- camera/Android.bp | 14 +++++-- camera/cameraserver/Android.bp | 1 + camera/ndk/Android.bp | 1 + camera/tests/Android.bp | 1 + camera/tests/fuzzer/Android.bp | 1 + media/audioserver/Android.bp | 2 +- .../hal/hidl/1.0/vts/functional/Android.bp | 1 + .../hidl/1.0/vts/functional/audio/Android.bp | 1 + .../hidl/1.0/vts/functional/common/Android.bp | 1 + .../1.0/vts/functional/component/Android.bp | 1 + .../hidl/1.0/vts/functional/master/Android.bp | 1 + .../hidl/1.0/vts/functional/video/Android.bp | 1 + media/libaaudio/examples/Android.bp | 1 + .../examples/input_monitor/Android.bp | 11 ++++- media/libaaudio/examples/loopback/Android.bp | 10 +++-- .../libaaudio/examples/write_sine/Android.bp | 11 ++++- media/libaaudio/fuzzer/Android.bp | 1 + media/libaaudio/src/Android.bp | 8 ++-- media/libaaudio/tests/Android.bp | 9 ++-- media/libaudioclient/Android.bp | 4 +- media/libaudioclient/aidl/fuzzer/Android.bp | 8 +++- media/libaudioclient/fuzzer/Android.bp | 1 + media/libaudioprocessing/tests/Android.bp | 1 + .../tests/fuzzer/Android.bp | 33 +++++++-------- media/libeffects/downmix/Android.bp | 3 +- media/libeffects/downmix/benchmark/Android.bp | 1 + media/libeffects/downmix/tests/Android.bp | 5 ++- media/libeffects/factory/Android.bp | 16 +++++--- media/libeffects/lvm/benchmarks/Android.bp | 1 + media/libeffects/lvm/lib/Android.bp | 1 + media/libeffects/lvm/tests/Android.bp | 5 ++- media/libeffects/lvm/wrapper/Android.bp | 1 + media/libeffects/preprocessing/Android.bp | 1 + .../preprocessing/benchmarks/Android.bp | 1 + .../libeffects/preprocessing/tests/Android.bp | 1 + .../spatializer/benchmarks/Android.bp | 1 + media/libeffects/spatializer/tests/Android.bp | 3 +- media/libheadtracking/Android.bp | 27 ++++++------ media/libshmem/Android.bp | 1 + media/utils/fuzzers/Android.bp | 1 + media/utils/tests/Android.bp | 1 + services/audioflinger/timing/tests/Android.bp | 41 ++++++++++--------- services/camera/virtualcamera/Android.bp | 1 + services/camera/virtualcamera/aidl/Android.bp | 1 + .../camera/virtualcamera/flags/Android.bp | 4 ++ .../camera/virtualcamera/fuzzer/Android.bp | 1 + .../camera/virtualcamera/tests/Android.bp | 1 + services/medialog/fuzzer/Android.bp | 1 + services/oboeservice/fuzzer/Android.bp | 1 + 49 files changed, 161 insertions(+), 84 deletions(-) diff --git a/camera/Android.bp b/camera/Android.bp index 4c5b16069c..d0f8e7e6cf 100644 --- a/camera/Android.bp +++ b/camera/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_camera_framework", default_applicable_licenses: ["frameworks_av_camera_license"], } @@ -65,6 +66,7 @@ cc_library_headers { name: "camera_headers", export_include_dirs: ["include"], } + cc_library { name: "libcamera_client", @@ -120,10 +122,14 @@ cc_library { "frameworks/native/include/media/openmax", ], export_include_dirs: [ - "include", - "include/camera" + "include", + "include/camera", + ], + export_shared_lib_headers: [ + "libcamera_metadata", + "libnativewindow", + "libgui", ], - export_shared_lib_headers: ["libcamera_metadata", "libnativewindow", "libgui"], cflags: [ "-Werror", @@ -153,7 +159,7 @@ cc_library_host_static { export_include_dirs: [ "include", - "include/camera" + "include/camera", ], } diff --git a/camera/cameraserver/Android.bp b/camera/cameraserver/Android.bp index 13b705cf9e..6862cb156b 100644 --- a/camera/cameraserver/Android.bp +++ b/camera/cameraserver/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_camera_framework", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "frameworks_av_camera_license" diff --git a/camera/ndk/Android.bp b/camera/ndk/Android.bp index 165395ab85..421469a3b1 100644 --- a/camera/ndk/Android.bp +++ b/camera/ndk/Android.bp @@ -17,6 +17,7 @@ // frameworks/av/include. package { + default_team: "trendy_team_camera_framework", default_applicable_licenses: ["frameworks_av_camera_ndk_license"], } diff --git a/camera/tests/Android.bp b/camera/tests/Android.bp index 65b8b41617..9aaac6ac52 100644 --- a/camera/tests/Android.bp +++ b/camera/tests/Android.bp @@ -13,6 +13,7 @@ // limitations under the License. package { + default_team: "trendy_team_camera_framework", // See: http://go/android-license-faq default_applicable_licenses: [ "frameworks_av_camera_license", diff --git a/camera/tests/fuzzer/Android.bp b/camera/tests/fuzzer/Android.bp index b74b7a10dc..bd97c39d64 100644 --- a/camera/tests/fuzzer/Android.bp +++ b/camera/tests/fuzzer/Android.bp @@ -14,6 +14,7 @@ * limitations under the License. */ package { + default_team: "trendy_team_camera_framework", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "frameworks_av_camera_license" diff --git a/media/audioserver/Android.bp b/media/audioserver/Android.bp index 2030dc782b..479e13aea1 100644 --- a/media/audioserver/Android.bp +++ b/media/audioserver/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_media_framework_audio", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "frameworks_av_license" @@ -71,7 +72,6 @@ cc_binary { "frameworks/av/services/medialog", "frameworks/av/services/oboeservice", // TODO oboeservice is the old folder name for aaudioservice. It will be changed. - ], init_rc: ["audioserver.rc"], diff --git a/media/codec2/hal/hidl/1.0/vts/functional/Android.bp b/media/codec2/hal/hidl/1.0/vts/functional/Android.bp index 2054fe6987..ccdde5e9ec 100644 --- a/media/codec2/hal/hidl/1.0/vts/functional/Android.bp +++ b/media/codec2/hal/hidl/1.0/vts/functional/Android.bp @@ -15,6 +15,7 @@ // package { + default_team: "trendy_team_media_codec_framework", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "frameworks_av_license" diff --git a/media/codec2/hal/hidl/1.0/vts/functional/audio/Android.bp b/media/codec2/hal/hidl/1.0/vts/functional/audio/Android.bp index 624aad2605..2b1bca017a 100644 --- a/media/codec2/hal/hidl/1.0/vts/functional/audio/Android.bp +++ b/media/codec2/hal/hidl/1.0/vts/functional/audio/Android.bp @@ -15,6 +15,7 @@ */ package { + default_team: "trendy_team_media_codec_framework", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "frameworks_av_license" diff --git a/media/codec2/hal/hidl/1.0/vts/functional/common/Android.bp b/media/codec2/hal/hidl/1.0/vts/functional/common/Android.bp index 0f0707772d..564de478d2 100644 --- a/media/codec2/hal/hidl/1.0/vts/functional/common/Android.bp +++ b/media/codec2/hal/hidl/1.0/vts/functional/common/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_media_codec_framework", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "frameworks_av_license" diff --git a/media/codec2/hal/hidl/1.0/vts/functional/component/Android.bp b/media/codec2/hal/hidl/1.0/vts/functional/component/Android.bp index cc019dad1e..0640f0245e 100644 --- a/media/codec2/hal/hidl/1.0/vts/functional/component/Android.bp +++ b/media/codec2/hal/hidl/1.0/vts/functional/component/Android.bp @@ -15,6 +15,7 @@ */ package { + default_team: "trendy_team_media_codec_framework", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "frameworks_av_license" diff --git a/media/codec2/hal/hidl/1.0/vts/functional/master/Android.bp b/media/codec2/hal/hidl/1.0/vts/functional/master/Android.bp index 40f52019df..5e52fde024 100644 --- a/media/codec2/hal/hidl/1.0/vts/functional/master/Android.bp +++ b/media/codec2/hal/hidl/1.0/vts/functional/master/Android.bp @@ -15,6 +15,7 @@ */ package { + default_team: "trendy_team_media_codec_framework", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "frameworks_av_license" diff --git a/media/codec2/hal/hidl/1.0/vts/functional/video/Android.bp b/media/codec2/hal/hidl/1.0/vts/functional/video/Android.bp index ecc4f9dcb6..d04c2f698f 100644 --- a/media/codec2/hal/hidl/1.0/vts/functional/video/Android.bp +++ b/media/codec2/hal/hidl/1.0/vts/functional/video/Android.bp @@ -15,6 +15,7 @@ */ package { + default_team: "trendy_team_media_codec_framework", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "frameworks_av_license" diff --git a/media/libaaudio/examples/Android.bp b/media/libaaudio/examples/Android.bp index e2c187864b..aa3ae5e3b5 100644 --- a/media/libaaudio/examples/Android.bp +++ b/media/libaaudio/examples/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_media_framework_audio", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "frameworks_av_license" diff --git a/media/libaaudio/examples/input_monitor/Android.bp b/media/libaaudio/examples/input_monitor/Android.bp index 72adfd7b69..52a5914267 100644 --- a/media/libaaudio/examples/input_monitor/Android.bp +++ b/media/libaaudio/examples/input_monitor/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_media_framework_audio", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "frameworks_av_license" @@ -11,7 +12,10 @@ cc_test { name: "input_monitor", gtest: false, srcs: ["src/input_monitor.cpp"], - cflags: ["-Wall", "-Werror"], + cflags: [ + "-Wall", + "-Werror", + ], shared_libs: ["libaaudio"], header_libs: ["libaaudio_example_utils"], } @@ -20,7 +24,10 @@ cc_test { name: "input_monitor_callback", gtest: false, srcs: ["src/input_monitor_callback.cpp"], - cflags: ["-Wall", "-Werror"], + cflags: [ + "-Wall", + "-Werror", + ], shared_libs: ["libaaudio"], header_libs: ["libaaudio_example_utils"], } diff --git a/media/libaaudio/examples/loopback/Android.bp b/media/libaaudio/examples/loopback/Android.bp index b18aeec4fd..65521135db 100644 --- a/media/libaaudio/examples/loopback/Android.bp +++ b/media/libaaudio/examples/loopback/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_media_framework_audio", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "frameworks_av_license" @@ -11,13 +12,16 @@ cc_test { name: "aaudio_loopback", gtest: false, srcs: ["src/loopback.cpp"], - cflags: ["-Wall", "-Werror"], + cflags: [ + "-Wall", + "-Werror", + ], static_libs: ["libsndfile"], include_dirs: ["external/oboe/apps/OboeTester/app/src/main/cpp"], shared_libs: [ "libaaudio", "libaudioutils", - "liblog" - ], + "liblog", + ], header_libs: ["libaaudio_example_utils"], } diff --git a/media/libaaudio/examples/write_sine/Android.bp b/media/libaaudio/examples/write_sine/Android.bp index 1c7e0f1e41..fe78112fda 100644 --- a/media/libaaudio/examples/write_sine/Android.bp +++ b/media/libaaudio/examples/write_sine/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_media_framework_audio", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "frameworks_av_license" @@ -10,7 +11,10 @@ package { cc_test { name: "write_sine", srcs: ["src/write_sine.cpp"], - cflags: ["-Wall", "-Werror"], + cflags: [ + "-Wall", + "-Werror", + ], shared_libs: ["libaaudio"], header_libs: ["libaaudio_example_utils"], } @@ -18,7 +22,10 @@ cc_test { cc_test { name: "write_sine_callback", srcs: ["src/write_sine_callback.cpp"], - cflags: ["-Wall", "-Werror"], + cflags: [ + "-Wall", + "-Werror", + ], shared_libs: ["libaaudio"], header_libs: ["libaaudio_example_utils"], } diff --git a/media/libaaudio/fuzzer/Android.bp b/media/libaaudio/fuzzer/Android.bp index 46c4148609..6d94f38ff5 100644 --- a/media/libaaudio/fuzzer/Android.bp +++ b/media/libaaudio/fuzzer/Android.bp @@ -15,6 +15,7 @@ */ package { + default_team: "trendy_team_media_framework_audio", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "frameworks_av_license" diff --git a/media/libaaudio/src/Android.bp b/media/libaaudio/src/Android.bp index fcb376c6f9..d2cb265f67 100644 --- a/media/libaaudio/src/Android.bp +++ b/media/libaaudio/src/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_media_framework_audio", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "frameworks_av_license" @@ -128,7 +129,7 @@ cc_library { tidy_checks_as_errors: tidy_errors, tidy_flags: [ "-format-style=file", - ] + ], } cc_library { @@ -250,7 +251,7 @@ cc_library { tidy_checks_as_errors: tidy_errors, tidy_flags: [ "-format-style=file", - ] + ], } aidl_interface { @@ -274,8 +275,7 @@ aidl_interface { "shared-file-region-aidl", "framework-permission-aidl", ], - backend: - { + backend: { java: { sdk_version: "module_current", }, diff --git a/media/libaaudio/tests/Android.bp b/media/libaaudio/tests/Android.bp index 30efeb077e..5ec8276299 100644 --- a/media/libaaudio/tests/Android.bp +++ b/media/libaaudio/tests/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_media_framework_audio", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "frameworks_av_license" @@ -183,9 +184,9 @@ cc_test { defaults: ["libaaudio_tests_defaults"], srcs: ["test_full_queue.cpp"], shared_libs: [ - "libaaudio", - "liblog" - ], + "libaaudio", + "liblog", + ], } cc_test { @@ -271,7 +272,7 @@ cc_test { { name: "native-test-timeout", value: "2m", - } + }, ], }, } diff --git a/media/libaudioclient/Android.bp b/media/libaudioclient/Android.bp index 369e917bd6..6cc5d634ac 100644 --- a/media/libaudioclient/Android.bp +++ b/media/libaudioclient/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_media_framework_audio", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "frameworks_av_license" @@ -52,7 +53,7 @@ cc_library { "AudioPolicy.cpp", "AudioProductStrategy.cpp", "AudioVolumeGroup.cpp", - "PolicyAidlConversion.cpp" + "PolicyAidlConversion.cpp", ], defaults: [ "latest_android_media_audio_common_types_cpp_export_shared", @@ -333,6 +334,7 @@ aidl_interface { }, }, } + aidl_interface { name: "audiopolicy-types-aidl", unstable: true, diff --git a/media/libaudioclient/aidl/fuzzer/Android.bp b/media/libaudioclient/aidl/fuzzer/Android.bp index 6093933a79..02c5a3f339 100644 --- a/media/libaudioclient/aidl/fuzzer/Android.bp +++ b/media/libaudioclient/aidl/fuzzer/Android.bp @@ -1,4 +1,8 @@ /* +package { + default_team: "trendy_team_media_framework_audio", +} + * Copyright (C) 2022 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -71,7 +75,7 @@ cc_defaults { "libbinder_headers", "libmedia_headers", ], - fuzz_config: { + fuzz_config: { cc: [ "android-media-fuzzing-reports@google.com", ], @@ -90,6 +94,6 @@ cc_fuzz { srcs: ["audioflinger_aidl_fuzzer.cpp"], defaults: [ "libaudioclient_aidl_fuzzer_defaults", - "service_fuzzer_defaults" + "service_fuzzer_defaults", ], } diff --git a/media/libaudioclient/fuzzer/Android.bp b/media/libaudioclient/fuzzer/Android.bp index fd3b0a842c..f2ad91c01b 100644 --- a/media/libaudioclient/fuzzer/Android.bp +++ b/media/libaudioclient/fuzzer/Android.bp @@ -15,6 +15,7 @@ */ package { + default_team: "trendy_team_media_framework_audio", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "frameworks_av_license" diff --git a/media/libaudioprocessing/tests/Android.bp b/media/libaudioprocessing/tests/Android.bp index ad402db441..a33bf55b71 100644 --- a/media/libaudioprocessing/tests/Android.bp +++ b/media/libaudioprocessing/tests/Android.bp @@ -1,6 +1,7 @@ // Build the unit tests for libaudioprocessing package { + default_team: "trendy_team_media_framework_audio", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "frameworks_av_license" diff --git a/media/libaudioprocessing/tests/fuzzer/Android.bp b/media/libaudioprocessing/tests/fuzzer/Android.bp index 8fb6fff66f..b96ec6b143 100644 --- a/media/libaudioprocessing/tests/fuzzer/Android.bp +++ b/media/libaudioprocessing/tests/fuzzer/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_media_framework_audio", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "frameworks_av_license" @@ -8,23 +9,23 @@ package { } cc_fuzz { - name: "libaudioprocessing_resampler_fuzzer", - srcs: [ - "libaudioprocessing_resampler_fuzzer.cpp", - ], - defaults: ["libaudioprocessing_test_defaults"], - static_libs: [ - "libsndfile", - ], + name: "libaudioprocessing_resampler_fuzzer", + srcs: [ + "libaudioprocessing_resampler_fuzzer.cpp", + ], + defaults: ["libaudioprocessing_test_defaults"], + static_libs: [ + "libsndfile", + ], } cc_fuzz { - name: "libaudioprocessing_record_buffer_converter_fuzzer", - srcs: [ - "libaudioprocessing_record_buffer_converter_fuzzer.cpp", - ], - defaults: ["libaudioprocessing_test_defaults"], - static_libs: [ - "libsndfile", - ], + name: "libaudioprocessing_record_buffer_converter_fuzzer", + srcs: [ + "libaudioprocessing_record_buffer_converter_fuzzer.cpp", + ], + defaults: ["libaudioprocessing_test_defaults"], + static_libs: [ + "libsndfile", + ], } diff --git a/media/libeffects/downmix/Android.bp b/media/libeffects/downmix/Android.bp index b56872cdc4..0b25327987 100644 --- a/media/libeffects/downmix/Android.bp +++ b/media/libeffects/downmix/Android.bp @@ -1,5 +1,6 @@ // Multichannel downmix effect library package { + default_team: "trendy_team_media_framework_audio", default_applicable_licenses: [ "frameworks_av_media_libeffects_downmix_license", ], @@ -60,7 +61,7 @@ cc_library_shared { ], header_libs: [ "libaudioeffects", - "libhardware_headers" + "libhardware_headers", ], shared_libs: [ "libaudioutils", diff --git a/media/libeffects/downmix/benchmark/Android.bp b/media/libeffects/downmix/benchmark/Android.bp index 10f14e2842..5b62a0c2ac 100644 --- a/media/libeffects/downmix/benchmark/Android.bp +++ b/media/libeffects/downmix/benchmark/Android.bp @@ -1,5 +1,6 @@ // Build testbench for downmix module. package { + default_team: "trendy_team_media_framework_audio", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "frameworks_av_media_libeffects_downmix_license" diff --git a/media/libeffects/downmix/tests/Android.bp b/media/libeffects/downmix/tests/Android.bp index 392a6faa28..77d8f831a8 100644 --- a/media/libeffects/downmix/tests/Android.bp +++ b/media/libeffects/downmix/tests/Android.bp @@ -1,5 +1,6 @@ // Build testbench for downmix module. package { + default_team: "trendy_team_media_framework_audio", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "frameworks_av_media_libeffects_downmix_license" @@ -14,7 +15,7 @@ package { // // Use "atest downmix_tests" to run. cc_test { - name:"downmix_tests", + name: "downmix_tests", gtest: true, host_supported: true, vendor: true, @@ -45,7 +46,7 @@ cc_test { // test application and outputs then compares files in a local directory // on device (/data/local/tmp/downmixtest/). cc_test { - name:"downmixtest", + name: "downmixtest", host_supported: false, proprietary: true, diff --git a/media/libeffects/factory/Android.bp b/media/libeffects/factory/Android.bp index d94093e2bf..ad5188fc03 100644 --- a/media/libeffects/factory/Android.bp +++ b/media/libeffects/factory/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_media_framework_audio", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "frameworks_av_license" @@ -20,10 +21,10 @@ cc_library_shared { name: "libeffects", vendor: true, srcs: [ - "EffectsFactory.c", - "EffectsConfigLoader.c", - "EffectsFactoryState.c", - "EffectsXmlConfigLoader.cpp", + "EffectsFactory.c", + "EffectsConfigLoader.c", + "EffectsFactoryState.c", + "EffectsXmlConfigLoader.cpp", ], shared_libs: [ @@ -34,7 +35,7 @@ cc_library_shared { ], cflags: ["-fvisibility=hidden"], - local_include_dirs:["include/media"], + local_include_dirs: ["include/media"], header_libs: [ "libaudioeffects", @@ -61,5 +62,8 @@ cc_binary { "libeffectsconfig", "libeffects", ], - local_include_dirs:[".", "include"], + local_include_dirs: [ + ".", + "include", + ], } diff --git a/media/libeffects/lvm/benchmarks/Android.bp b/media/libeffects/lvm/benchmarks/Android.bp index c21c5f28f3..8036983a5b 100644 --- a/media/libeffects/lvm/benchmarks/Android.bp +++ b/media/libeffects/lvm/benchmarks/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_media_framework_audio", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "frameworks_av_license" diff --git a/media/libeffects/lvm/lib/Android.bp b/media/libeffects/lvm/lib/Android.bp index 799887948e..c1a77f07a7 100644 --- a/media/libeffects/lvm/lib/Android.bp +++ b/media/libeffects/lvm/lib/Android.bp @@ -1,5 +1,6 @@ // Music bundle package { + default_team: "trendy_team_media_framework_audio", default_applicable_licenses: [ "frameworks_av_media_libeffects_lvm_lib_license", ], diff --git a/media/libeffects/lvm/tests/Android.bp b/media/libeffects/lvm/tests/Android.bp index 0568fbd18e..c32e91e4e5 100644 --- a/media/libeffects/lvm/tests/Android.bp +++ b/media/libeffects/lvm/tests/Android.bp @@ -1,6 +1,7 @@ // Build the unit tests for effects package { + default_team: "trendy_team_media_framework_audio", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "frameworks_av_license" @@ -12,7 +13,7 @@ package { cc_test { name: "EffectReverbTest", defaults: [ - "libeffects-test-defaults", + "libeffects-test-defaults", ], srcs: [ "EffectReverbTest.cpp", @@ -29,7 +30,7 @@ cc_test { cc_test { name: "EffectBundleTest", defaults: [ - "libeffects-test-defaults", + "libeffects-test-defaults", ], srcs: [ "EffectBundleTest.cpp", diff --git a/media/libeffects/lvm/wrapper/Android.bp b/media/libeffects/lvm/wrapper/Android.bp index 62837b9701..781aad682a 100644 --- a/media/libeffects/lvm/wrapper/Android.bp +++ b/media/libeffects/lvm/wrapper/Android.bp @@ -1,5 +1,6 @@ // music bundle wrapper package { + default_team: "trendy_team_media_framework_audio", default_applicable_licenses: [ "frameworks_av_media_libeffects_lvm_wrapper_license", ], diff --git a/media/libeffects/preprocessing/Android.bp b/media/libeffects/preprocessing/Android.bp index 994b061856..d658536f3a 100644 --- a/media/libeffects/preprocessing/Android.bp +++ b/media/libeffects/preprocessing/Android.bp @@ -1,5 +1,6 @@ // audio preprocessing wrapper package { + default_team: "trendy_team_media_framework_audio", default_applicable_licenses: [ "frameworks_av_media_libeffects_preprocessing_license", ], diff --git a/media/libeffects/preprocessing/benchmarks/Android.bp b/media/libeffects/preprocessing/benchmarks/Android.bp index fbbcab4de4..ca99bf8342 100644 --- a/media/libeffects/preprocessing/benchmarks/Android.bp +++ b/media/libeffects/preprocessing/benchmarks/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_media_framework_audio", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "frameworks_av_media_libeffects_preprocessing_license" diff --git a/media/libeffects/preprocessing/tests/Android.bp b/media/libeffects/preprocessing/tests/Android.bp index d80b135706..ad8d84d7cd 100644 --- a/media/libeffects/preprocessing/tests/Android.bp +++ b/media/libeffects/preprocessing/tests/Android.bp @@ -1,5 +1,6 @@ // audio preprocessing unit test package { + default_team: "trendy_team_media_framework_audio", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "frameworks_av_media_libeffects_preprocessing_license" diff --git a/media/libeffects/spatializer/benchmarks/Android.bp b/media/libeffects/spatializer/benchmarks/Android.bp index ab7e468dd8..2d07a9b7ff 100644 --- a/media/libeffects/spatializer/benchmarks/Android.bp +++ b/media/libeffects/spatializer/benchmarks/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_media_framework_audio", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "frameworks_av_license" diff --git a/media/libeffects/spatializer/tests/Android.bp b/media/libeffects/spatializer/tests/Android.bp index 704e8733a6..ddfcff3c9f 100644 --- a/media/libeffects/spatializer/tests/Android.bp +++ b/media/libeffects/spatializer/tests/Android.bp @@ -1,6 +1,7 @@ // Build the unit tests for spatializer effect package { + default_team: "trendy_team_media_framework_audio", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "frameworks_av_license" @@ -12,7 +13,7 @@ package { cc_test { name: "SpatializerTest", defaults: [ - "libeffects-test-defaults", + "libeffects-test-defaults", ], host_supported: false, srcs: [ diff --git a/media/libheadtracking/Android.bp b/media/libheadtracking/Android.bp index 995586288a..70a242d7de 100644 --- a/media/libheadtracking/Android.bp +++ b/media/libheadtracking/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_media_framework_audio", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "frameworks_av_license" @@ -11,18 +12,18 @@ cc_library { name: "libheadtracking", host_supported: true, srcs: [ - "HeadTrackingProcessor.cpp", - "ModeSelector.cpp", - "Pose.cpp", - "PoseBias.cpp", - "PoseDriftCompensator.cpp", - "PosePredictor.cpp", - "PoseRateLimiter.cpp", - "QuaternionUtil.cpp", - "ScreenHeadFusion.cpp", - "StillnessDetector.cpp", - "Twist.cpp", - "VectorRecorder.cpp", + "HeadTrackingProcessor.cpp", + "ModeSelector.cpp", + "Pose.cpp", + "PoseBias.cpp", + "PoseDriftCompensator.cpp", + "PosePredictor.cpp", + "PoseRateLimiter.cpp", + "QuaternionUtil.cpp", + "ScreenHeadFusion.cpp", + "StillnessDetector.cpp", + "Twist.cpp", + "VectorRecorder.cpp", ], shared_libs: [ "libaudioutils", @@ -51,7 +52,7 @@ cc_library { cc_library { name: "libheadtracking-binding", srcs: [ - "SensorPoseProvider.cpp", + "SensorPoseProvider.cpp", ], shared_libs: [ "libbase", diff --git a/media/libshmem/Android.bp b/media/libshmem/Android.bp index 6e48078d58..486a34fe38 100644 --- a/media/libshmem/Android.bp +++ b/media/libshmem/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_media_framework_audio", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "frameworks_av_license" diff --git a/media/utils/fuzzers/Android.bp b/media/utils/fuzzers/Android.bp index bd9a4620ef..0a047c14b1 100644 --- a/media/utils/fuzzers/Android.bp +++ b/media/utils/fuzzers/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_media_framework_audio", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "frameworks_av_license" diff --git a/media/utils/tests/Android.bp b/media/utils/tests/Android.bp index 3fdc6eb2dd..a68569a942 100644 --- a/media/utils/tests/Android.bp +++ b/media/utils/tests/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_media_framework_audio", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "frameworks_av_license" diff --git a/services/audioflinger/timing/tests/Android.bp b/services/audioflinger/timing/tests/Android.bp index d1e5563831..040a91466c 100644 --- a/services/audioflinger/timing/tests/Android.bp +++ b/services/audioflinger/timing/tests/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_media_framework_audio", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "frameworks_base_license" @@ -13,7 +14,7 @@ cc_test { host_supported: true, srcs: [ - "mediasyncevent_tests.cpp" + "mediasyncevent_tests.cpp", ], header_libs: [ @@ -38,7 +39,7 @@ cc_test { host_supported: true, srcs: [ - "monotonicframecounter_tests.cpp" + "monotonicframecounter_tests.cpp", ], static_libs: [ @@ -54,26 +55,26 @@ cc_test { } cc_test { - name: "synchronizedrecordstate_tests", + name: "synchronizedrecordstate_tests", - host_supported: true, + host_supported: true, - srcs: [ - "synchronizedrecordstate_tests.cpp" - ], + srcs: [ + "synchronizedrecordstate_tests.cpp", + ], - header_libs: [ - "libaudioclient_headers", - ], + header_libs: [ + "libaudioclient_headers", + ], - static_libs: [ - "liblog", - "libutils", // RefBase - ], + static_libs: [ + "liblog", + "libutils", // RefBase + ], - cflags: [ - "-Wall", - "-Werror", - "-Wextra", - ], - } \ No newline at end of file + cflags: [ + "-Wall", + "-Werror", + "-Wextra", + ], +} diff --git a/services/camera/virtualcamera/Android.bp b/services/camera/virtualcamera/Android.bp index 94007cd59f..74b2e2c1e1 100644 --- a/services/camera/virtualcamera/Android.bp +++ b/services/camera/virtualcamera/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_xr_framework", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/services/camera/virtualcamera/aidl/Android.bp b/services/camera/virtualcamera/aidl/Android.bp index a02d390ba6..b3fe3add0f 100644 --- a/services/camera/virtualcamera/aidl/Android.bp +++ b/services/camera/virtualcamera/aidl/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_xr_framework", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/services/camera/virtualcamera/flags/Android.bp b/services/camera/virtualcamera/flags/Android.bp index 3ff67eaddb..5fa885297e 100644 --- a/services/camera/virtualcamera/flags/Android.bp +++ b/services/camera/virtualcamera/flags/Android.bp @@ -1,3 +1,7 @@ +package { + default_team: "trendy_team_xr_framework", +} + soong_config_module_type { name: "virtual_device_build_flags_cc_defaults", module_type: "cc_defaults", diff --git a/services/camera/virtualcamera/fuzzer/Android.bp b/services/camera/virtualcamera/fuzzer/Android.bp index afa1e44efb..6a72167cb1 100644 --- a/services/camera/virtualcamera/fuzzer/Android.bp +++ b/services/camera/virtualcamera/fuzzer/Android.bp @@ -16,6 +16,7 @@ * *****************************************************************************/ package { + default_team: "trendy_team_xr_framework", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/services/camera/virtualcamera/tests/Android.bp b/services/camera/virtualcamera/tests/Android.bp index 13104c1f14..c51b4a37fa 100644 --- a/services/camera/virtualcamera/tests/Android.bp +++ b/services/camera/virtualcamera/tests/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_xr_framework", // See: http://go/android-license-faq default_applicable_licenses: ["Android-Apache-2.0"], } diff --git a/services/medialog/fuzzer/Android.bp b/services/medialog/fuzzer/Android.bp index c96c37b03e..bf90f4313b 100644 --- a/services/medialog/fuzzer/Android.bp +++ b/services/medialog/fuzzer/Android.bp @@ -1,4 +1,5 @@ package { + default_team: "trendy_team_media_framework_audio", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "frameworks_av_license" diff --git a/services/oboeservice/fuzzer/Android.bp b/services/oboeservice/fuzzer/Android.bp index c130b12735..31ed8ac06b 100644 --- a/services/oboeservice/fuzzer/Android.bp +++ b/services/oboeservice/fuzzer/Android.bp @@ -19,6 +19,7 @@ */ package { + default_team: "trendy_team_media_framework_audio", // See: http://go/android-license-faq // A large-scale-change added 'default_applicable_licenses' to import // all of the 'license_kinds' from "frameworks_av_license"