diff options
| author | 2020-06-02 05:33:09 +0000 | |
|---|---|---|
| committer | 2020-06-03 02:47:34 +0000 | |
| commit | 82e4bc5d0c0c426b2666038a66f3e7367966643c (patch) | |
| tree | 5e6afd915572afbc584fd014bdacf330f7022762 | |
| parent | 4003bd9def460e72965b4fbef75ae99b7de34e29 (diff) | |
Revert^2 "Retire mainline.mk"
This reverts commit 4003bd9def460e72965b4fbef75ae99b7de34e29.
Reason for revert: cleaned up mainline.mk users
Bug: 157548597
Fixes: 141443017
Change-Id: I5e38620ed1c90f7188901eb148c7e3aa0596a27d
| -rw-r--r-- | target/product/mainline.mk | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/target/product/mainline.mk b/target/product/mainline.mk deleted file mode 100644 index 22436e66b3..0000000000 --- a/target/product/mainline.mk +++ /dev/null @@ -1,39 +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. -# - -# This makefile is intended to serve as a base for completely AOSP based -# mainline devices, It contain the mainline system partition and sensible -# defaults for the system_ext, product and vendor partitions. -$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk) - -$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_vendor.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_product.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_vendor.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_product.mk) - -$(call inherit-product, frameworks/base/data/sounds/AllAudio.mk) - -PRODUCT_PROPERTY_OVERRIDES += \ - ro.config.ringtone=Ring_Synth_04.ogg \ - ro.com.android.dataroaming=true \ - -PRODUCT_PACKAGES += \ - PhotoTable \ - WallpaperPicker \ - -PRODUCT_COPY_FILES += device/sample/etc/apns-full-conf.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/apns-conf.xml |