Android 15.0.0 Release 6 (AP4A.241205.013)
-----BEGIN PGP SIGNATURE----- iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IssQAKCRDorT+BmrEO eIS/AJ9ojetnDXDlslBpaDU7nNPVrNv+WgCeMKWKeHmJn6acS37FiZBS9+jvpec= =JvPS -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iQJLBAABCgA1FiEEHrBYPudH862glXQBzJUERRm+ZmkFAmdY7O4XHG1rYmVzdGFz QGxpbmVhZ2Vvcy5vcmcACgkQzJUERRm+ZmnGCw//XCwIcPsFqQSwygK76wo5ZsCO Mex6U5SdmtBecQ2VmIZKofe4/HIog9Wne3GFE6Xjj1bZHxtp/W4uURp6BQ8LuqA5 zqhkzc/Ijz6W+8wJ7n4k+V+N33N9ZYrbxQdqmBbMzLO0kOv86vC0HbKHLLgvT5d4 yYTe3TmGUMXTysky8+Y5YJoIHXqy847ohsOg7yzo9wtEzNZpDXLjDCfp4H8Gei8c RIw/g+P2WwXGEntlXMtt6lajLF5m2GOtGLL5S+IrtoskpISC6jOmnD+WDwG8VJRW dts4yqRtB47uz53sLE618zOXE/Tz3Akppq73bJ9I5dk3qHCx7NBVy5HLFE8O6rJL KVjMj88sMShd4wMbHEy+Sh0jVlcKXuxFJeU0MZ0bqoM5/MDDZXQvJDOOQK7noQHS RGnsXFwgZnLZEW375FJv4T8S19logSJqAYEkjSdrzU3oIUZqNgFHqQcGDLC8ukOc 79PbK53RvmzyEedYonH7Zn/ImGwmJxlyVey5jFX+O1S9RsVD4AyrgT1dn3s0KniK 1UiPi7sHBsL2yE4rp63UEysFZU9uj2gy3xf4PxBi97LV7mLUfE2YqsDwOrII82Ao xjyEKTxSMADdwHHI15yf52eNRCf3eBakL54TbZZJ184FZYeTGvOpvc5yCuiITqm9 RauADk94HVdaaMJXyk4= =l74W -----END PGP SIGNATURE----- Merge tag 'android-15.0.0_r6' into staging/lineage-22.0_merge-android-15.0.0_r6 Android 15.0.0 Release 6 (AP4A.241205.013) # -----BEGIN PGP SIGNATURE----- # # iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IssQAKCRDorT+BmrEO # eIS/AJ9ojetnDXDlslBpaDU7nNPVrNv+WgCeMKWKeHmJn6acS37FiZBS9+jvpec= # =JvPS # -----END PGP SIGNATURE----- # gpg: Signature made Fri Dec 6 00:44:01 2024 EET # gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78 # gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal] # gpg: initial-contribution@android.com: Verified 2483 signatures in the past # 3 years. Encrypted 4 messages in the past 2 years. # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 4340 D135 70EF 945E 8381 0964 E8AD 3F81 9AB1 0E78 # By Randall Huang (12) and others # Via Android (Google) Code Review (58) and others * tag 'android-15.0.0_r6': (91 commits) gsc: Change the criteria for building GSC targets sepolicy: remove irregular policy Revert^2 "Allow devices that use HIDL to find AIDL radio_ext_service" Revert "Allow devices that use HIDL to find AIDL radio_ext_service" gs-common: add rules for euiccpixel_app audio: allow set_prop for vendor_audio_prop_restricted Allow devices that use HIDL to find AIDL radio_ext_service Add sepolicy for NNAPI HAL to access hal_graphics_allocator_service, This is required for AHardwareBuffer allocation. storage: fix ota selinux error Storage: add sepolicy for recovery mode Add sepolicy for gcam app check_current_prebuilt: Symlink current prebuilt folder to android root shamp: Update shared_modem_platform HAL version to 3 dumpstate: gsa: Add GSA logs to dumpstate storage: fix vendor_init avc denied storage: fix vold avc denied storage: fix adb bugreport and refactor the existing rules storage: fix PowerStats avc denied storage: move sepolicy to common folder shamp: Update shared_modem_platform HAL version to 2 ... Conflicts: camera/lyric.mk storage/init.storage.rc Change-Id: I5ed6cff3b54261c949ec6ba60b32820b264b4ec2
This commit is contained in:
commit
4460098bc5
170 changed files with 1189 additions and 318 deletions
|
@ -1,6 +1,6 @@
|
|||
# Dauntless
|
||||
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/dauntless/sepolicy
|
||||
ifneq ($(wildcard vendor),)
|
||||
ifneq ($(wildcard vendor/google_nos),)
|
||||
PRODUCT_SOONG_NAMESPACES += vendor/google_nos/init/dauntless
|
||||
|
||||
PRODUCT_PACKAGES += \
|
||||
|
@ -20,4 +20,76 @@ PRODUCT_PACKAGES_ENG += citadel_integration_tests \
|
|||
nugget_targeted_tests \
|
||||
CitadelProvision \
|
||||
nugget_aidl_test_weaver
|
||||
|
||||
# Assign default value for RELEASE_GOOGLE_DAUNTLESS_DIR if no trunk flags support
|
||||
RELEASE_GOOGLE_DAUNTLESS_DIR ?= vendor/google_nos/prebuilts/dauntless
|
||||
|
||||
# The production Dauntless firmware will be of flavors evt and d3m2.
|
||||
# There are also several flavors of pre-release chips. Each flavor
|
||||
# (production and pre-release) requires the firmware to be signed differently.
|
||||
DAUNTLESS_FIRMWARE_SIZE := 1048576
|
||||
|
||||
# The nearly-production Dauntless chips are "proto1.1"
|
||||
ifneq (,$(wildcard $(RELEASE_GOOGLE_DAUNTLESS_DIR)/proto11.ec.bin))
|
||||
ifneq ($(DAUNTLESS_FIRMWARE_SIZE), $(shell stat -c "%s" $(RELEASE_GOOGLE_DAUNTLESS_DIR)/proto11.ec.bin))
|
||||
$(error GSC firmware size check fail)
|
||||
endif
|
||||
PRODUCT_COPY_FILES += \
|
||||
$(RELEASE_GOOGLE_DAUNTLESS_DIR)/proto11.ec.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/dauntless/proto11.ec.bin
|
||||
$(call dist-for-goals,droid,$(RELEASE_GOOGLE_DAUNTLESS_DIR)/proto11.ec.bin)
|
||||
else
|
||||
$(error GSC firmware not found in $(RELEASE_GOOGLE_DAUNTLESS_DIR))
|
||||
endif
|
||||
|
||||
# The production Dauntless chips are "evt"
|
||||
ifneq (,$(wildcard $(RELEASE_GOOGLE_DAUNTLESS_DIR)/evt.ec.bin))
|
||||
ifneq ($(DAUNTLESS_FIRMWARE_SIZE), $(shell stat -c "%s" $(RELEASE_GOOGLE_DAUNTLESS_DIR)/evt.ec.bin))
|
||||
$(error GSC firmware size check fail)
|
||||
endif
|
||||
PRODUCT_COPY_FILES += \
|
||||
$(RELEASE_GOOGLE_DAUNTLESS_DIR)/evt.ec.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/dauntless/evt.ec.bin
|
||||
$(call dist-for-goals,droid,$(RELEASE_GOOGLE_DAUNTLESS_DIR)/evt.ec.bin)
|
||||
else
|
||||
$(error GSC firmware not found in $(RELEASE_GOOGLE_DAUNTLESS_DIR))
|
||||
endif
|
||||
|
||||
# New 2023 production Dauntless chips are "d3m2"
|
||||
ifneq (,$(wildcard $(RELEASE_GOOGLE_DAUNTLESS_DIR)/d3m2.ec.bin))
|
||||
ifneq ($(DAUNTLESS_FIRMWARE_SIZE), $(shell stat -c "%s" $(RELEASE_GOOGLE_DAUNTLESS_DIR)/d3m2.ec.bin))
|
||||
$(error GSC firmware size check fail)
|
||||
endif
|
||||
PRODUCT_COPY_FILES += \
|
||||
$(RELEASE_GOOGLE_DAUNTLESS_DIR)/d3m2.ec.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/dauntless/d3m2.ec.bin
|
||||
$(call dist-for-goals,droid,$(RELEASE_GOOGLE_DAUNTLESS_DIR)/d3m2.ec.bin)
|
||||
else
|
||||
$(error GSC firmware not found in $(RELEASE_GOOGLE_DAUNTLESS_DIR))
|
||||
endif
|
||||
|
||||
# Intermediate image artifacts are published, but aren't included in /vendor/firmware/dauntless
|
||||
# in PRODUCT_COPY_FILES
|
||||
# This is because intermediate images aren't needed on user devices, but the published artifact
|
||||
# is useful for flashstation purposes.
|
||||
|
||||
# proto11 chips need an intermediate image prior to upgrading to newever versions of the firmware
|
||||
ifneq (,$(wildcard vendor/google_nos/prebuilts/dauntless/intermediate_images/proto11_intermediate.ec.bin))
|
||||
ifneq ($(DAUNTLESS_FIRMWARE_SIZE), $(shell stat -c "%s" vendor/google_nos/prebuilts/dauntless/intermediate_images/proto11_intermediate.ec.bin))
|
||||
$(error GSC firmware size check fail)
|
||||
endif
|
||||
$(call dist-for-goals,droid,vendor/google_nos/prebuilts/dauntless/intermediate_images/proto11_intermediate.ec.bin)
|
||||
endif
|
||||
# evt chips need an intermediate image prior to upgrading to newever versions of the firmware
|
||||
ifneq (,$(wildcard vendor/google_nos/prebuilts/dauntless/intermediate_images/evt_intermediate.ec.bin))
|
||||
ifneq ($(DAUNTLESS_FIRMWARE_SIZE), $(shell stat -c "%s" vendor/google_nos/prebuilts/dauntless/intermediate_images/evt_intermediate.ec.bin))
|
||||
$(error GSC firmware size check fail)
|
||||
endif
|
||||
$(call dist-for-goals,droid,vendor/google_nos/prebuilts/dauntless/intermediate_images/evt_intermediate.ec.bin)
|
||||
endif
|
||||
# d3m2 chips need an intermediate image prior to upgrading to newever versions of the firmware
|
||||
ifneq (,$(wildcard vendor/google_nos/prebuilts/dauntless/intermediate_images/d3m2_intermediate.ec.bin))
|
||||
ifneq ($(DAUNTLESS_FIRMWARE_SIZE), $(shell stat -c "%s" vendor/google_nos/prebuilts/dauntless/intermediate_images/d3m2_intermediate.ec.bin))
|
||||
$(error GSC firmware size check fail)
|
||||
endif
|
||||
$(call dist-for-goals,droid,vendor/google_nos/prebuilts/dauntless/intermediate_images/d3m2_intermediate.ec.bin)
|
||||
endif
|
||||
|
||||
endif # $(wildcard vendor/google_nos)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue