StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include soong modules instead of using PRODUCT_COPY_FILES

Browse Source 
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
This commit is contained in:
Justin Yun
2024-06-24 18:14:38 +09:00
parent 4c47a8925e
commit db07c59d96
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
target/product/handheld_system.mk
View File

@@ -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) $(call inherit-product-if-exists, frameworks/webview/chromium/chromium.mk)
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
android.software.window_magnification.prebuilt.xml \
BasicDreams \ BasicDreams \
BlockedNumberProvider \ BlockedNumberProvider \
BluetoothMidiService \ BluetoothMidiService \
@@ -88,9 +89,6 @@ PRODUCT_SYSTEM_SERVER_APPS += \
PRODUCT_PACKAGES += framework-audio_effects.xml 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 += \ PRODUCT_VENDOR_PROPERTIES += \
ro.carrier?=unknown \ ro.carrier?=unknown \
ro.config.notification_sound?=OnTheHunt.ogg \ ro.config.notification_sound?=OnTheHunt.ogg \

8
target/product/media_system.mk
View File

@@ -21,6 +21,7 @@
$(call inherit-product, $(SRC_TARGET_DIR)/product/base_system.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/base_system.mk)
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
android.software.webview.prebuilt.xml \
com.android.future.usb.accessory \ com.android.future.usb.accessory \
com.android.mediadrm.signer \ com.android.mediadrm.signer \
com.android.media.remotedisplay \ com.android.media.remotedisplay \
@@ -39,12 +40,9 @@ PRODUCT_PACKAGES += \
PRODUCT_HOST_PACKAGES += \ PRODUCT_HOST_PACKAGES += \
fsck.f2fs \ 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)) ifneq (REL,$(PLATFORM_VERSION_CODENAME))
PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \
frameworks/native/data/etc/android.software.preview_sdk.xml:system/etc/permissions/android.software.preview_sdk.xml android.software.preview_sdk.prebuilt.xml
endif endif
# The order here is the same order they end up on the classpath, so it matters. # The order here is the same order they end up on the classpath, so it matters.