From cb559ac3d89db720bb2df2f2899c2a8bed2547db Mon Sep 17 00:00:00 2001 From: Yo Chiang Date: Thu, 19 Sep 2019 10:15:10 +0800 Subject: [PATCH] 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_, ...). Bug: 141443017 Test: TH Change-Id: I8e0825b2d94134fd8e9e3edc5e2aa15dbcdf10ba Merged-In: I08990b70d45c0663a9700f41b670513674bf7e97 --- target/product/AndroidProducts.mk | 1 - target/product/mainline_arm64.mk | 37 ------------------------------- 2 files changed, 38 deletions(-) delete mode 100644 target/product/mainline_arm64.mk diff --git a/target/product/AndroidProducts.mk b/target/product/AndroidProducts.mk index 4121bc10e2..3949737d16 100644 --- a/target/product/AndroidProducts.mk +++ b/target/product/AndroidProducts.mk @@ -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 \ diff --git a/target/product/mainline_arm64.mk b/target/product/mainline_arm64.mk deleted file mode 100644 index 850c7754a5..0000000000 --- a/target/product/mainline_arm64.mk +++ /dev/null @@ -1,37 +0,0 @@ -# -# 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 - -# TODO(b/137033385): change this back to "all" -PRODUCT_RESTRICT_VENDOR_FILES := owner - -PRODUCT_NAME := mainline_arm64 -PRODUCT_DEVICE := mainline_arm64 -PRODUCT_BRAND := generic