DO NOT MERGE - Mark RQ3A.210410.001 as merged
Bug: 190855093
Merged-In: I0c1406290cb1a1062c87915a8b260f3199e49d44
Change-Id: I2126f4986d3637cdc497693bc680a3b045850d4e
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..80433fd
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,42 @@
+//
+// Copyright (C) 2021 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package {
+ default_applicable_licenses: ["device_google_atv_license"],
+}
+
+// Added automatically by a large-scale-change that took the approach of
+// 'apply every license found to every target'. While this makes sure we respect
+// every license restriction, it may not be entirely correct.
+//
+// e.g. GPL in an MIT project might only apply to the contrib/ directory.
+//
+// Please consider splitting the single license below into multiple licenses,
+// taking care not to lose any license_kind information, and overriding the
+// default license using the 'licenses: [...]' property on targets as needed.
+//
+// For unused files, consider creating a 'fileGroup' with "//visibility:private"
+// to attach the license to, and including a comment whether the files may be
+// used in the current project.
+// See: http://go/android-license-faq
+license {
+ name: "device_google_atv_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-Apache-2.0",
+ "legacy_notice",
+ ],
+ // large-scale-change unable to identify any license_text files
+}
diff --git a/LeanbackSampleApp/Android.mk b/LeanbackSampleApp/Android.mk
index a9c0737..de1de0a 100644
--- a/LeanbackSampleApp/Android.mk
+++ b/LeanbackSampleApp/Android.mk
@@ -2,6 +2,8 @@
include $(CLEAR_VARS)
LOCAL_MODULE := LeanbackSampleApp
+LOCAL_LICENSE_KINDS := legacy_notice
+LOCAL_LICENSE_CONDITIONS := notice
LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
LOCAL_MODULE_CLASS := APPS
LOCAL_MODULE_TAGS := optional
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..d97975c
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,3 @@
+third_party {
+ license_type: NOTICE
+}
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..b955d02
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,8 @@
+# Bug component: 760438
+
+helenparsons@google.com
+hgchen@google.com
+rgl@google.com
+saagarp@google.com
+shaopengjia@google.com
+wyau@google.com
\ No newline at end of file
diff --git a/TvProvision/Android.bp b/TvProvision/Android.bp
index ed00008..f32673b 100644
--- a/TvProvision/Android.bp
+++ b/TvProvision/Android.bp
@@ -1,3 +1,12 @@
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "device_google_atv_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["device_google_atv_license"],
+}
+
prebuilt_etc {
name: "privapp_whitelist_com.android.tv.provision",
product_specific: true,
diff --git a/TvSampleLeanbackLauncher/Android.bp b/TvSampleLeanbackLauncher/Android.bp
index 9c09168..8b525f0 100644
--- a/TvSampleLeanbackLauncher/Android.bp
+++ b/TvSampleLeanbackLauncher/Android.bp
@@ -1,3 +1,12 @@
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "device_google_atv_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["device_google_atv_license"],
+}
+
prebuilt_etc {
name: "privapp_whitelist_com.example.sampleleanbacklauncher",
product_specific: true,
diff --git a/audio_proxy/Android.bp b/audio_proxy/Android.bp
index 3c926bd..2f7e00a 100644
--- a/audio_proxy/Android.bp
+++ b/audio_proxy/Android.bp
@@ -1,7 +1,16 @@
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "device_google_atv_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["device_google_atv_license"],
+}
+
cc_library {
name: "libaudio_proxy.google",
- product_specific: true,
+ system_ext_specific: true,
srcs: [
"AudioProxy.cpp",
@@ -29,7 +38,7 @@
cc_defaults {
name: "libaudio_proxy_client_default",
- product_specific: true,
+ system_ext_specific: true,
srcs: [
"AudioProxyDevice.cpp",
diff --git a/audio_proxy/OWNERS b/audio_proxy/OWNERS
new file mode 100644
index 0000000..0a96942
--- /dev/null
+++ b/audio_proxy/OWNERS
@@ -0,0 +1,2 @@
+yucliu@google.com
+prohr@google.com
diff --git a/audio_proxy/interfaces/5.0/Android.bp b/audio_proxy/interfaces/5.0/Android.bp
index 85ca5a3..ab3ca26 100644
--- a/audio_proxy/interfaces/5.0/Android.bp
+++ b/audio_proxy/interfaces/5.0/Android.bp
@@ -1,9 +1,18 @@
// This file is autogenerated by hidl-gen -Landroidbp.
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "device_google_atv_license"
+ // to get the below license kinds:
+ // legacy_notice
+ default_applicable_licenses: ["device_google_atv_license"],
+}
+
hidl_interface {
name: "device.google.atv.audio_proxy@5.0",
root: "device.google.atv.audio_proxy",
- product_specific: true,
+ system_ext_specific: true,
srcs: [
"IAudioProxyDevicesManager.hal",
"IBusDevice.hal",
@@ -16,4 +25,3 @@
],
gen_java: false,
}
-
diff --git a/audio_proxy/interfaces/Android.bp b/audio_proxy/interfaces/Android.bp
index 89d436a..1a15b5e 100644
--- a/audio_proxy/interfaces/Android.bp
+++ b/audio_proxy/interfaces/Android.bp
@@ -1,3 +1,12 @@
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "device_google_atv_license"
+ // to get the below license kinds:
+ // legacy_notice
+ default_applicable_licenses: ["device_google_atv_license"],
+}
+
hidl_package_root {
name: "device.google.atv.audio_proxy",
path: "device/google/atv/audio_proxy/interfaces",
diff --git a/audio_proxy/sepolicy/hal_audio_proxy.te b/audio_proxy/sepolicy/hal_audio_proxy.te
index 134e24b..d015e7c 100644
--- a/audio_proxy/sepolicy/hal_audio_proxy.te
+++ b/audio_proxy/sepolicy/hal_audio_proxy.te
@@ -4,5 +4,5 @@
binder_call(hal_audio_proxy_client, hal_audio_proxy_server)
binder_call(hal_audio_proxy_server, hal_audio_proxy_client)
-type hal_audio_proxy_hwservice, hwservice_manager_type;
+type hal_audio_proxy_hwservice, hwservice_manager_type, vendor_hwservice_type;
hal_attribute_hwservice(hal_audio_proxy, hal_audio_proxy_hwservice)
diff --git a/audio_proxy/service/Android.bp b/audio_proxy/service/Android.bp
index fa2bfb6..7ff75e3 100644
--- a/audio_proxy/service/Android.bp
+++ b/audio_proxy/service/Android.bp
@@ -12,6 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "device_google_atv_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["device_google_atv_license"],
+}
+
cc_binary {
name: "device.google.atv.audio_proxy@5.0-service",
vendor: true,
diff --git a/products/atv_mainline_system.mk b/products/atv_mainline_system.mk
index b2148f0..1afc39e 100644
--- a/products/atv_mainline_system.mk
+++ b/products/atv_mainline_system.mk
@@ -80,7 +80,6 @@
PRODUCT_COPY_FILES += \
system/core/rootdir/init.zygote32.rc:system/etc/init/hw/init.zygote32.rc \
system/core/rootdir/init.zygote64.rc:system/etc/init/hw/init.zygote64.rc \
- system/core/rootdir/init.zygote32_64.rc:system/etc/init/hw/init.zygote32_64.rc \
system/core/rootdir/init.zygote64_32.rc:system/etc/init/hw/init.zygote64_32.rc
# Enable dynamic partition size
diff --git a/products/atv_system.mk b/products/atv_system.mk
index 78255df..e6c99b2 100644
--- a/products/atv_system.mk
+++ b/products/atv_system.mk
@@ -45,7 +45,6 @@
CaptivePortalLogin \
CertInstaller \
clatd \
- clatd.conf \
ExternalStorageProvider \
FusedLocation \
InputDevices \
diff --git a/products/bootanimations/bootanimation.zip b/products/bootanimations/bootanimation.zip
index b274f33..ee1b6bf 100644
--- a/products/bootanimations/bootanimation.zip
+++ b/products/bootanimations/bootanimation.zip
Binary files differ
