Fix build for Android 12

This commit is contained in:
Pierre-Hugues Husson 2021-10-13 11:00:32 -04:00
parent 6a1917d307
commit 9e30f63a84
6 changed files with 7 additions and 4 deletions

View File

@ -205,3 +205,5 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
oplus-alert-slider oplus-alert-slider
include build/make/target/product/gsi_release.mk

View File

@ -4,3 +4,4 @@ TARGET_EXFAT_DRIVER := exfat
DEVICE_FRAMEWORK_MANIFEST_FILE := device/phh/treble/framework_manifest.xml DEVICE_FRAMEWORK_MANIFEST_FILE := device/phh/treble/framework_manifest.xml
BOARD_ROOT_EXTRA_FOLDERS += bt_firmware sec_storage efs BOARD_ROOT_EXTRA_FOLDERS += bt_firmware sec_storage efs
BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES := true

View File

@ -79,7 +79,7 @@ for part in a ab;do
cat > ${target}.mk << EOF cat > ${target}.mk << EOF
TARGET_GAPPS_ARCH := ${baseArch} TARGET_GAPPS_ARCH := ${baseArch}
\$(call inherit-product, device/phh/treble/base-pre.mk) \$(call inherit-product, device/phh/treble/base-pre.mk)
include build/make/target/product/aosp_${baseArch}_ab.mk include build/make/target/product/aosp_${baseArch}.mk
\$(call inherit-product, device/phh/treble/base.mk) \$(call inherit-product, device/phh/treble/base.mk)
$optional_base $optional_base
$apps_script $apps_script

View File

@ -1,4 +1,4 @@
include build/make/target/board/generic_arm_ab/BoardConfig.mk include build/make/target/board/generic/BoardConfig.mk
include device/phh/treble/board-base.mk include device/phh/treble/board-base.mk
ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),) ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),)

View File

@ -1,4 +1,4 @@
include build/make/target/board/generic_arm64_ab/BoardConfig.mk include build/make/target/board/generic_arm64/BoardConfig.mk
include device/phh/treble/board-base.mk include device/phh/treble/board-base.mk
ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),) ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),)

View File

@ -28,7 +28,7 @@ allow system_app hal_tp_default:binder { call };
allow system_app vendor_default_prop:property_service { set }; allow system_app vendor_default_prop:property_service { set };
set_prop(system_app, default_prop); set_prop(system_app, default_prop);
set_prop(system_app, exported3_default_prop); #set_prop(system_app, exported3_default_prop);
type mtk_hal_rild_hwservice, hwservice_manager_type; type mtk_hal_rild_hwservice, hwservice_manager_type;
allow system_app mtk_hal_rild_hwservice:hwservice_manager { find}; allow system_app mtk_hal_rild_hwservice:hwservice_manager { find};