Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6956735a authored by Florian Mayer's avatar Florian Mayer Committed by Automerger Merge Worker
Browse files

Merge "Add aosp_arm64_fullmte target" am: 9066ab52 am: 34ed46e6 

Original change: https://android-review.googlesource.com/c/platform/build/+/2617516



Change-Id: I5c743947964fcf5dd6359821f41da2dcb809946b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7ade48d4 34ed46e6

target/product/AndroidProducts.mk

+2 −0
Original line number Diff line number Diff line
@@ -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 \

target/product/aosp_arm64_fullmte.mk

0 → 100644
+27 −0
Original line number Diff line number Diff line 
# 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