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

Commit db07c59d authored by Justin Yun's avatar Justin Yun
Browse files

Include soong modules instead of using PRODUCT_COPY_FILES 

The xml files are defined as prebuilt_etc modules. Use those modules
instead of copying them manually with PRODUCT_COPY_FILES.

Bug: 314933937
Test: m aosp_cf_system_x86_64
Change-Id: I97569381a29ade620584b96b20908c514a07e981
parent 4c47a892

target/product/handheld_system.mk

+1 −3
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ $(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk) 
$(call inherit-product-if-exists, frameworks/webview/chromium/chromium.mk)



PRODUCT_PACKAGES += \

    android.software.window_magnification.prebuilt.xml \

    BasicDreams \

    BlockedNumberProvider \

    BluetoothMidiService \
@@ -88,9 +89,6 @@ PRODUCT_SYSTEM_SERVER_APPS += \ 


PRODUCT_PACKAGES += framework-audio_effects.xml



PRODUCT_COPY_FILES += \

    frameworks/native/data/etc/android.software.window_magnification.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/android.software.window_magnification.xml \



PRODUCT_VENDOR_PROPERTIES += \

    ro.carrier?=unknown \

    ro.config.notification_sound?=OnTheHunt.ogg \

target/product/media_system.mk

+3 −5
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
$(call inherit-product, $(SRC_TARGET_DIR)/product/base_system.mk)



PRODUCT_PACKAGES += \

    android.software.webview.prebuilt.xml \

    com.android.future.usb.accessory \

    com.android.mediadrm.signer \

    com.android.media.remotedisplay \
@@ -39,12 +40,9 @@ PRODUCT_PACKAGES += \ 
PRODUCT_HOST_PACKAGES += \

    fsck.f2fs \



PRODUCT_COPY_FILES += \

    frameworks/native/data/etc/android.software.webview.xml:system/etc/permissions/android.software.webview.xml



ifneq (REL,$(PLATFORM_VERSION_CODENAME))

PRODUCT_COPY_FILES += \

    frameworks/native/data/etc/android.software.preview_sdk.xml:system/etc/permissions/android.software.preview_sdk.xml

PRODUCT_PACKAGES += \

    android.software.preview_sdk.prebuilt.xml

endif



# The order here is the same order they end up on the classpath, so it matters.