Skip to content

Commit

Permalink
[DON'T BLOCK] Test ownership migration rules
Browse files Browse the repository at this point in the history
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,
<add g3 doc link>

Bug: 304529413
Test: N/A
Change-Id: I6bc538dec03600aa3a7f7075209e031f2826baff
  • Loading branch information
Ronish Kalia committed Feb 14, 2024
1 parent 55db67d commit b5dd44b
Show file tree
Hide file tree
Showing 49 changed files with 161 additions and 84 deletions.
14 changes: 10 additions & 4 deletions camera/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
// limitations under the License.

package {
default_team: "trendy_team_camera_framework",
default_applicable_licenses: ["frameworks_av_camera_license"],
}

Expand Down Expand Up @@ -65,6 +66,7 @@ cc_library_headers {
name: "camera_headers",
export_include_dirs: ["include"],
}

cc_library {
name: "libcamera_client",

Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -153,7 +159,7 @@ cc_library_host_static {

export_include_dirs: [
"include",
"include/camera"
"include/camera",
],
}

Expand Down
1 change: 1 addition & 0 deletions camera/cameraserver/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions camera/ndk/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
// frameworks/av/include.

package {
default_team: "trendy_team_camera_framework",
default_applicable_licenses: ["frameworks_av_camera_ndk_license"],
}

Expand Down
1 change: 1 addition & 0 deletions camera/tests/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions camera/tests/fuzzer/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion media/audioserver/Android.bp
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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"],
Expand Down
1 change: 1 addition & 0 deletions media/codec2/hal/hidl/1.0/vts/functional/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions media/codec2/hal/hidl/1.0/vts/functional/audio/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions media/codec2/hal/hidl/1.0/vts/functional/common/Android.bp
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions media/codec2/hal/hidl/1.0/vts/functional/master/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions media/codec2/hal/hidl/1.0/vts/functional/video/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions media/libaaudio/examples/Android.bp
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
11 changes: 9 additions & 2 deletions media/libaaudio/examples/input_monitor/Android.bp
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"],
}
Expand All @@ -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"],
}
10 changes: 7 additions & 3 deletions media/libaaudio/examples/loopback/Android.bp
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"],
}
11 changes: 9 additions & 2 deletions media/libaaudio/examples/write_sine/Android.bp
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -10,15 +11,21 @@ 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"],
}

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"],
}
1 change: 1 addition & 0 deletions media/libaaudio/fuzzer/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions media/libaaudio/src/Android.bp
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -128,7 +129,7 @@ cc_library {
tidy_checks_as_errors: tidy_errors,
tidy_flags: [
"-format-style=file",
]
],
}

cc_library {
Expand Down Expand Up @@ -250,7 +251,7 @@ cc_library {
tidy_checks_as_errors: tidy_errors,
tidy_flags: [
"-format-style=file",
]
],
}

aidl_interface {
Expand All @@ -274,8 +275,7 @@ aidl_interface {
"shared-file-region-aidl",
"framework-permission-aidl",
],
backend:
{
backend: {
java: {
sdk_version: "module_current",
},
Expand Down
9 changes: 5 additions & 4 deletions media/libaaudio/tests/Android.bp
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -183,9 +184,9 @@ cc_test {
defaults: ["libaaudio_tests_defaults"],
srcs: ["test_full_queue.cpp"],
shared_libs: [
"libaaudio",
"liblog"
],
"libaaudio",
"liblog",
],
}

cc_test {
Expand Down Expand Up @@ -271,7 +272,7 @@ cc_test {
{
name: "native-test-timeout",
value: "2m",
}
},
],
},
}
4 changes: 3 additions & 1 deletion media/libaudioclient/Android.bp
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -333,6 +334,7 @@ aidl_interface {
},
},
}

aidl_interface {
name: "audiopolicy-types-aidl",
unstable: true,
Expand Down
8 changes: 6 additions & 2 deletions media/libaudioclient/aidl/fuzzer/Android.bp
Original file line number Diff line number Diff line change
@@ -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");
Expand Down Expand Up @@ -71,7 +75,7 @@ cc_defaults {
"libbinder_headers",
"libmedia_headers",
],
fuzz_config: {
fuzz_config: {
cc: [
"[email protected]",
],
Expand All @@ -90,6 +94,6 @@ cc_fuzz {
srcs: ["audioflinger_aidl_fuzzer.cpp"],
defaults: [
"libaudioclient_aidl_fuzzer_defaults",
"service_fuzzer_defaults"
"service_fuzzer_defaults",
],
}
1 change: 1 addition & 0 deletions media/libaudioclient/fuzzer/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions media/libaudioprocessing/tests/Android.bp
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Loading

0 comments on commit b5dd44b

Please sign in to comment.