diff options
| author | Yo Chiang <yochiang@google.com> | 2020-06-03 03:02:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 03:02:49 +0000 |
| commit | eb4f43e6cc4f21c18190709fd46764e3e245320b (patch) | |
| tree | 3126636c3941ffb1ecfa1751bdb7be1fa5c3521e | |
| parent | 6231dd8584d6c8f206a8b35b9c952daa604a16ca (diff) | |
| parent | 2ca90c5e973f6979b1dd6a1b2ad1cad408e2620e (diff) | |
| download | build-eb4f43e6cc4f21c18190709fd46764e3e245320b.tar.gz | |
Merge "Revert^2 "Retire mainline.mk"" am: 2ca90c5e97
Original change: https://android-review.googlesource.com/c/platform/build/+/1322634
Change-Id: Ia1fe27c92188cf0dc07a1dcc44e819a2babd617c
| -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 |