p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Add more product defaults to mainline.mk"

This commit is contained in:
Anton Hansson 2019-04-03 08:28:06 +00:00 committed by Gerrit Code Review
parent 31a7dee48b 5aa8db53a2
commit 7369b7622f
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
target/product/gsi_common.mk
View File

@ -31,7 +31,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
# The mainline checking whitelist, should be clean up # The mainline checking whitelist, should be clean up
PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \ PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST += \
system/app/messaging/messaging.apk \ system/app/messaging/messaging.apk \
system/app/PhotoTable/PhotoTable.apk \
system/app/WAPPushManager/WAPPushManager.apk \ system/app/WAPPushManager/WAPPushManager.apk \
system/bin/healthd \ system/bin/healthd \
system/etc/init/healthd.rc \ system/etc/init/healthd.rc \

18
target/product/mainline.mk
View File

@ -14,10 +14,24 @@
# limitations under the License. # limitations under the License.
# #
# Makefile including the mainline system image, and the relevant AOSP portions # This makefile is intended to serve as a base for completely AOSP based
# for the other partitions. # 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/mainline_system.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_vendor.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/handheld_product.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_vendor.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_vendor.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_product.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