diff options
| author | Florian Mayer <fmayer@google.com> | 2023-06-20 23:10:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-06-20 23:10:32 +0000 |
| commit | 9ea49efa299802256a9b138dcc40c96493130beb (patch) | |
| tree | 3691dbf9119d233fb9a5c6846cb4bbc90a56842c | |
| parent | ffd1290cc9fbb08f87fd906dbca6339ad6323aa4 (diff) | |
| parent | 8bb740db1ae9bf65d1eadaeb057a54ebcd8d2c3b (diff) | |
| download | build-android14-dev.tar.gz | |
Merge "Add aosp_arm64_fullmte target" into udc-devandroid14-dev
| -rw-r--r-- | target/product/AndroidProducts.mk | 2 | ||||
| -rw-r--r-- | target/product/aosp_arm64_fullmte.mk | 27 |
2 files changed, 29 insertions, 0 deletions
diff --git a/target/product/AndroidProducts.mk b/target/product/AndroidProducts.mk index 1e0ce19926..133dc7354e 100644 --- a/target/product/AndroidProducts.mk +++ b/target/product/AndroidProducts.mk @@ -35,6 +35,7 @@ ifneq ($(TARGET_BUILD_APPS),) PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/aosp_arm64.mk \ + $(LOCAL_DIR)/aosp_arm64_fullmte.mk \ $(LOCAL_DIR)/aosp_arm.mk \ $(LOCAL_DIR)/aosp_riscv64.mk \ $(LOCAL_DIR)/aosp_x86_64.mk \ @@ -46,6 +47,7 @@ else PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/aosp_64bitonly_x86_64.mk \ $(LOCAL_DIR)/aosp_arm64.mk \ + $(LOCAL_DIR)/aosp_arm64_fullmte.mk \ $(LOCAL_DIR)/aosp_arm.mk \ $(LOCAL_DIR)/aosp_riscv64.mk \ $(LOCAL_DIR)/aosp_x86_64.mk \ diff --git a/target/product/aosp_arm64_fullmte.mk b/target/product/aosp_arm64_fullmte.mk new file mode 100644 index 0000000000..ed6bd4a5f0 --- /dev/null +++ b/target/product/aosp_arm64_fullmte.mk @@ -0,0 +1,27 @@ +# Copyright (C) 2023 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. +# + +include $(SRC_TARGET_DIR)/product/fullmte.mk + +PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed + +$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_arm64.mk) + +# Build modules from source if this has not been pre-configured +MODULE_BUILD_FROM_SOURCE ?= true + +$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk) + +PRODUCT_NAME := aosp_arm64_fullmte |