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

Commit 68bee4b6 authored by Yo Chiang's avatar Yo Chiang
Browse files

Remove mainline_arm64.mk 

mainline_arm64 is broken for quite some time. Let's just remove it
rather than trying to fix it.
IIUC this was a testing ground for mainline_system.mk when it was first
introduced. Now we have plenty of products that use mainline_system.mk
(e.g. mainline_system_arm64, aosp_arm64, aosp_<pixel>, ...).

Bug: 141443017
Test: TH
Change-Id: I08990b70d45c0663a9700f41b670513674bf7e97
parent cae87d6f

target/product/AndroidProducts.mk

+0 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ PRODUCT_MAKEFILES := \ 
    $(LOCAL_DIR)/generic.mk \

    $(LOCAL_DIR)/generic_x86.mk \

    $(LOCAL_DIR)/gsi_arm64.mk \

    $(LOCAL_DIR)/mainline_arm64.mk \

    $(LOCAL_DIR)/mainline_system_arm64.mk \

    $(LOCAL_DIR)/mainline_system_x86.mk \

    $(LOCAL_DIR)/mainline_system_x86_arm.mk \

target/product/mainline_arm64.mk

deleted100644 → 0
+0 −36
Original line number Diff line number Diff line 
#

# Copyright (C) 2018 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.

#



$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline.mk)

whitelist := product_manifest.xml

$(call enforce-product-packages-exist,$(whitelist))



PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed



# Modules that should probably be moved to /product

PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \

  system/bin/healthd \

  system/etc/init/healthd.rc \

  system/etc/vintf/manifest/manifest_healthd.xml \



PRODUCT_SHIPPING_API_LEVEL := 29



PRODUCT_RESTRICT_VENDOR_FILES := all



PRODUCT_NAME := mainline_arm64

PRODUCT_DEVICE := mainline_arm64

PRODUCT_BRAND := generic