Merge "Move gsi_arm64 makefile to device/generic/common" am: 6059135b8b
Original change: https://android-review.googlesource.com/c/platform/build/+/1552334 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7139c0a98d2910336fc2d9ad7530f8cd87bf774b
This commit is contained in:
@@ -57,7 +57,6 @@ PRODUCT_MAKEFILES := \
|
||||
$(LOCAL_DIR)/generic_system_x86_64.mk \
|
||||
$(LOCAL_DIR)/generic_system_x86_arm.mk \
|
||||
$(LOCAL_DIR)/generic_x86.mk \
|
||||
$(LOCAL_DIR)/gsi_arm64.mk \
|
||||
$(LOCAL_DIR)/mainline_system_arm64.mk \
|
||||
$(LOCAL_DIR)/mainline_system_x86.mk \
|
||||
$(LOCAL_DIR)/mainline_system_x86_64.mk \
|
||||
|
@@ -1,46 +0,0 @@
|
||||
#
|
||||
# Copyright (C) 2019 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
|
||||
#
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk)
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk)
|
||||
|
||||
#
|
||||
# All components inherited here go to product image
|
||||
#
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
|
||||
|
||||
#
|
||||
# Special settings for GSI releasing
|
||||
#
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
|
||||
|
||||
|
||||
PRODUCT_NAME := gsi_arm64
|
||||
PRODUCT_DEVICE := gsi_arm64
|
||||
PRODUCT_BRAND := generic
|
||||
PRODUCT_MODEL := GSI on ARM64
|
Reference in New Issue
Block a user