Merge Android 13 QPR2
Bug: 273316506 Merged-In: I22777c8a2daabab0f32b360be32c6f1d7eea9fa0 Change-Id: I924fa975c08c578e9feb339fd56b4c535b9b15f0
This commit is contained in:
@@ -255,13 +255,6 @@ BOARD_GOOGLE_DYNAMIC_PARTITIONS_SIZE := 4873781248
|
||||
# Set error limit to BOARD_SUPER_PARTITON_SIZE - 500MB
|
||||
BOARD_SUPER_PARTITION_ERROR_LIMIT := 9231663104
|
||||
|
||||
# Note as of b/216531063, our sunfish_tuscany builds are
|
||||
# exceeding the super partition limit, causing all builds
|
||||
# to fail. Here we increase it by 600 MB to keep building.
|
||||
ifeq (,$(filter-out sunfish_tuscany, $(TARGET_PRODUCT)))
|
||||
BOARD_SUPER_PARTITION_ERROR_LIMIT := 9831663104
|
||||
endif
|
||||
|
||||
# DTB
|
||||
ifeq (,$(filter-out sunfish_kasan, $(TARGET_PRODUCT)))
|
||||
BOARD_PREBUILT_DTBIMAGE_DIR := device/google/sunfish-kernel/kasan
|
||||
|
||||
@@ -148,4 +148,9 @@
|
||||
<!-- Notifications -->
|
||||
<permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
|
||||
</exception>
|
||||
<exception
|
||||
package="com.google.android.euicc">
|
||||
<!-- Notifications -->
|
||||
<permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
|
||||
</exception>
|
||||
</exceptions>
|
||||
|
||||
@@ -885,7 +885,7 @@ PRODUCT_PACKAGES += $(HIDL_WRAPPER)
|
||||
|
||||
# Increment the SVN for any official public releases
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
ro.vendor.build.svn=55
|
||||
ro.vendor.build.svn=57
|
||||
|
||||
PRODUCT_COPY_FILES += \
|
||||
$(LOCAL_PATH)/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json
|
||||
|
||||
Reference in New Issue
Block a user