diff options
author | Hongguang <hgchen@google.com> | 2022-04-14 23:33:42 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-14 23:33:42 +0000 |
commit | f4c1c092f4127f3ae3999b1e4bc7301cf65b6902 (patch) | |
tree | e77d43b6521ee6a71f6c1a395056de359e1c0a94 | |
parent | 96a5747b77f63c1cf0729c7d2fb5efb3922bfbe3 (diff) | |
parent | 52f3bbbc538755725d2e77072cb13e4f592beac3 (diff) | |
download | atv-f4c1c092f4127f3ae3999b1e4bc7301cf65b6902.tar.gz |
Add TV GSI build targets am: 52f3bbbc53
Original change: https://googleplex-android-review.googlesource.com/c/device/google/atv/+/17749586
Change-Id: Iff3c01eb67ac0651dfd8cb2799ed187cf3489bf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | products/AndroidProducts.mk | 2 | ||||
-rw-r--r-- | products/gsi_tv_arm.mk | 32 | ||||
-rw-r--r-- | products/gsi_tv_arm64.mk | 37 | ||||
-rw-r--r-- | products/gsi_tv_base.mk | 52 |
4 files changed, 123 insertions, 0 deletions
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk index bd75dca..110cf2f 100644 --- a/products/AndroidProducts.mk +++ b/products/AndroidProducts.mk @@ -35,5 +35,7 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/aosp_tv_arm.mk \ $(LOCAL_DIR)/aosp_tv_arm64.mk \ $(LOCAL_DIR)/aosp_tv_x86.mk \ + $(LOCAL_DIR)/gsi_tv_arm.mk \ + $(LOCAL_DIR)/gsi_tv_arm64.mk \ $(LOCAL_DIR)/sdk_atv_armv7.mk \ $(LOCAL_DIR)/sdk_atv_x86.mk diff --git a/products/gsi_tv_arm.mk b/products/gsi_tv_arm.mk new file mode 100644 index 0000000..7081e24 --- /dev/null +++ b/products/gsi_tv_arm.mk @@ -0,0 +1,32 @@ +# +# Copyright (C) 2022 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. +# + +# The system image of gsi_tv_arm-userdebug is the GSI for TV devices with: +# - ARM 32-bit userspace +# - 64-bit binder interface +# - system-as-root +# - VNDK enforcement +# - compatible property override enabled + +# +# Common TV GSI components +# +$(call inherit-product, device/google/atv/products/gsi_tv_base.mk) + +PRODUCT_NAME := gsi_tv_arm +PRODUCT_DEVICE := generic +PRODUCT_BRAND := Android +PRODUCT_MODEL := TV GSI on ARM diff --git a/products/gsi_tv_arm64.mk b/products/gsi_tv_arm64.mk new file mode 100644 index 0000000..e50de4e --- /dev/null +++ b/products/gsi_tv_arm64.mk @@ -0,0 +1,37 @@ +# +# Copyright (C) 2022 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. +# + +# The system image of gsi_tv_arm64-userdebug is the GSI for TV devices with: +# - ARM 64-bit userspace +# - 64-bit binder interface +# - system-as-root +# - VNDK enforcement +# - compatible property override enabled + +# +# Additional components for 64 bits devices. +# +$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) + +# +# Common TV GSI components +# +$(call inherit-product, device/google/atv/products/gsi_tv_base.mk) + +PRODUCT_NAME := gsi_tv_arm64 +PRODUCT_DEVICE := generic_arm64 +PRODUCT_BRAND := Android +PRODUCT_MODEL := TV GSI on ARM64 diff --git a/products/gsi_tv_base.mk b/products/gsi_tv_base.mk new file mode 100644 index 0000000..acda9fb --- /dev/null +++ b/products/gsi_tv_base.mk @@ -0,0 +1,52 @@ +# +# Copyright (C) 2022 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. +# + +# +# All components inherited here go to system image +# +$(call inherit-product, device/google/atv/products/atv_generic_system.mk) + +# Enable mainline checking +PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := true + +# +# All components inherited here go to system_ext image +# +$(call inherit-product, device/google/atv/products/atv_system_ext.mk) + +# Packages required for ATV GSI +PRODUCT_PACKAGES += \ + TvProvision + +# Install a copy of the debug policy to the system_ext partition, and allow +# init-second-stage to load debug policy from system_ext. +# This option is only meant to be set by compliance GSI targets. +PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT := true +PRODUCT_PACKAGES += system_ext_userdebug_plat_sepolicy.cil + +# +# All components inherited here go to product image +# +$(call inherit-product, device/google/atv/products/atv_product.mk) +# Packages required for ATV GSI +PRODUCT_PACKAGES += \ + LeanbackIME \ + TvSampleLeanbackLauncher + +# +# Special settings for GSI releasing +# +$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk) |