diff options
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-21 03:43:03 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-21 03:43:03 +0000 |
commit | ede76398d6576f716940a2156b1b20c18d36a60b (patch) | |
tree | 8267552a2a8f5ce5534f5ac2cb73672378845fa3 | |
parent | 9f6c2d5480594514fa0e8cd107657ab26fbf4a2f (diff) | |
parent | 6c045588aeeae1c3225ad7aec2849da217c4b505 (diff) | |
download | device_generic_common-ede76398d6576f716940a2156b1b20c18d36a60b.tar.gz device_generic_common-ede76398d6576f716940a2156b1b20c18d36a60b.tar.bz2 device_generic_common-ede76398d6576f716940a2156b1b20c18d36a60b.zip |
Merge "Create bootable CSI products" am: b4998d388e am: b48e540bf0 am: 6c045588ae
Change-Id: I10587807187cd92cb4d50d798343d96877ba78e2
-rw-r--r-- | mgsi/AndroidProducts.mk | 2 | ||||
-rw-r--r-- | mgsi/csi_arm64.mk | 51 | ||||
-rw-r--r-- | mgsi/csi_x86.mk | 49 |
3 files changed, 102 insertions, 0 deletions
diff --git a/mgsi/AndroidProducts.mk b/mgsi/AndroidProducts.mk index 4f2851a..f6b0bfc 100644 --- a/mgsi/AndroidProducts.mk +++ b/mgsi/AndroidProducts.mk @@ -15,6 +15,8 @@ # PRODUCT_MAKEFILES := \ + device/generic/common/mgsi/csi_arm64.mk \ + device/generic/common/mgsi/csi_x86.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_arm64.mk b/mgsi/csi_arm64.mk new file mode 100644 index 0000000..142a8ec --- /dev/null +++ b/mgsi/csi_arm64.mk @@ -0,0 +1,51 @@ +# +# Copyright (C) 2020 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/mainline_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 +# +# NFC: Provide a libnfc-nci.conf to CSI (to avoid nfc related exceptions) +PRODUCT_COPY_FILES += device/generic/common/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf + +# +# 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 + + +PRODUCT_NAME := csi_arm64 +PRODUCT_DEVICE := dummy_arm64 +PRODUCT_BRAND := Android +PRODUCT_MODEL := arm64 CSI diff --git a/mgsi/csi_x86.mk b/mgsi/csi_x86.mk new file mode 100644 index 0000000..749b1ca --- /dev/null +++ b/mgsi/csi_x86.mk @@ -0,0 +1,49 @@ +# +# Copyright (C) 2020 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. +# + +PRODUCT_USE_DYNAMIC_PARTITIONS := true + +# +# All components inherited here go to system image +# +$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_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 +# +# NFC: Provide a libnfc-nci.conf to CSI (to avoid nfc related exceptions) +PRODUCT_COPY_FILES += device/generic/common/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf + +# +# 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) + + +PRODUCT_NAME := csi_x86 +PRODUCT_DEVICE := dummy_x86 +PRODUCT_BRAND := Android +PRODUCT_MODEL := x86 CSI |