From 5aa8db53a21b1221fb4519b4259f76108f167d56 Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Fri, 29 Mar 2019 13:55:12 +0000 Subject: [PATCH] Add more product defaults to mainline.mk Replicate aosp_blueline's configuration, which is shared with other pixels, and explicitly repurpose this to be a generic AOSP mainline device. Clean up associated whitelist entries in gsi for the apps I'm moving to /product in the same topic. Bug: 129077057 Test: boot aosp_blueline Test: browse ringtones Change-Id: I8424cb23923987d2176369f93b479fc827fbabef --- target/product/gsi_common.mk | 1 - target/product/mainline.mk | 18 ++++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/target/product/gsi_common.mk b/target/product/gsi_common.mk index 5e73e63243..2c978ab25b 100644 --- a/target/product/gsi_common.mk +++ b/target/product/gsi_common.mk @@ -31,7 +31,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ # The mainline checking whitelist, should be clean up PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \ system/app/messaging/messaging.apk \ - system/app/PhotoTable/PhotoTable.apk \ system/app/WAPPushManager/WAPPushManager.apk \ system/bin/healthd \ system/etc/init/healthd.rc \ diff --git a/target/product/mainline.mk b/target/product/mainline.mk index 59bad9838d..7900cdfee7 100644 --- a/target/product/mainline.mk +++ b/target/product/mainline.mk @@ -14,10 +14,24 @@ # limitations under the License. # -# Makefile including the mainline system image, and the relevant AOSP portions -# for the other partitions. +# 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 product and vendor partition. $(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.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_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