diff options
author | Isaac Chen <ycchen@google.com> | 2021-01-14 09:27:07 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-14 09:27:07 +0000 |
commit | 66cebc6250e6d1079114afc9c02edd7711f4f1e3 (patch) | |
tree | 346e3da5bcfffa482f5b7b27cd41c2b73df8bad1 | |
parent | 1526920eca628769b53799a52e80e5c9d8dcff57 (diff) | |
parent | c4a3cab77276ebabc8951ac1556f10de57c85783 (diff) | |
download | common-66cebc6250e6d1079114afc9c02edd7711f4f1e3.tar.gz |
Merge "Create CSI products: csi_x86_64 and csi_arm" am: b01c09444a am: c4a3cab772
Original change: https://android-review.googlesource.com/c/device/generic/common/+/1545230
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I608f9c7ab7d4f417d59320bf2d69e1a505f12785
-rw-r--r-- | mgsi/AndroidProducts.mk | 2 | ||||
-rw-r--r-- | mgsi/csi_arm.mk | 54 | ||||
-rw-r--r-- | mgsi/csi_x86_64.mk | 55 |
3 files changed, 111 insertions, 0 deletions
diff --git a/mgsi/AndroidProducts.mk b/mgsi/AndroidProducts.mk index f6b0bfc..1b1f66e 100644 --- a/mgsi/AndroidProducts.mk +++ b/mgsi/AndroidProducts.mk @@ -15,8 +15,10 @@ # PRODUCT_MAKEFILES := \ + device/generic/common/mgsi/csi_arm.mk \ device/generic/common/mgsi/csi_arm64.mk \ device/generic/common/mgsi/csi_x86.mk \ + device/generic/common/mgsi/csi_x86_64.mk \ device/generic/common/mgsi/mgsi_arm.mk \ device/generic/common/mgsi/mgsi_arm64.mk \ device/generic/common/mgsi/mgsi_x86.mk \ diff --git a/mgsi/csi_arm.mk b/mgsi/csi_arm.mk new file mode 100644 index 0000000..2739ec1 --- /dev/null +++ b/mgsi/csi_arm.mk @@ -0,0 +1,54 @@ +# +# 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. +# + +# +# All components inherited here go to system image +# +$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk) + +# Enable mainline checking +PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed + +# +# All components inherited here go to system_ext image +# +# VNDK snapshot is needed to support older vendor images +$(call inherit-product, $(SRC_TARGET_DIR)/product/media_system_ext.mk) + +# +# All components below go to product image +# + +# +# Special settings to skip mount product and system_ext on the device, +# so this product can be tested isolated from those partitions. +# +$(call inherit-product, device/generic/common/mgsi/mgsi_release.mk) + +# Don't build super.img. +PRODUCT_BUILD_SUPER_PARTITION := false + +# Instruct AM to enable framework's fallback home activity +PRODUCT_SYSTEM_EXT_PROPERTIES += ro.system_user_home_needed=true +# Add RRO needed by CSI +PRODUCT_PACKAGE_OVERLAYS := device/generic/common/mgsi/overlay + +PRODUCT_SOONG_NAMESPACES += device/generic/goldfish + +PRODUCT_NAME := csi_arm +PRODUCT_DEVICE := dummy_arm +PRODUCT_BRAND := Android +PRODUCT_MODEL := arm CSI diff --git a/mgsi/csi_x86_64.mk b/mgsi/csi_x86_64.mk new file mode 100644 index 0000000..cceed35 --- /dev/null +++ b/mgsi/csi_x86_64.mk @@ -0,0 +1,55 @@ +# +# 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. +# + +# +# All components inherited here go to system image +# +$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/generic_system.mk) + +# Enable mainline checking +PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed + +# +# All components inherited here go to system_ext image +# +# VNDK snapshot is needed to support older vendor images +$(call inherit-product, $(SRC_TARGET_DIR)/product/media_system_ext.mk) + +# +# All components below go to product image +# + +# +# Special settings to skip mount product and system_ext on the device, +# so this product can be tested isolated from those partitions. +# +$(call inherit-product, device/generic/common/mgsi/mgsi_release.mk) + +# Don't build super.img. +PRODUCT_BUILD_SUPER_PARTITION := false + +# Instruct AM to enable framework's fallback home activity +PRODUCT_SYSTEM_EXT_PROPERTIES += ro.system_user_home_needed=true +# Add RRO needed by CSI +PRODUCT_PACKAGE_OVERLAYS := device/generic/common/mgsi/overlay + +PRODUCT_SOONG_NAMESPACES += device/generic/goldfish + +PRODUCT_NAME := csi_x86_64 +PRODUCT_DEVICE := dummy_x86_64 +PRODUCT_BRAND := Android +PRODUCT_MODEL := x86_64 CSI |