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

Commit ce2754f5 authored by Anton Hansson's avatar Anton Hansson Committed by android-build-merger
Browse files

Merge "Add more product defaults to mainline.mk" am: 7369b762 

am: b35434d9

Change-Id: Id1bf855ed130145740ea3f08acc6b95004611ef7
parents 719b51b4 b35434d9

target/product/gsi_common.mk

+0 −1
Original line number Diff line number Diff line
@@ -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 \

target/product/mainline.mk

+16 −2
Original line number Diff line number Diff line
@@ -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