4460098bc5
-----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
63 lines
2.4 KiB
Makefile
63 lines
2.4 KiB
Makefile
PRODUCT_SOONG_NAMESPACES += \
|
|
hardware/google/camera
|
|
|
|
$(call soong_config_set,lyric,use_lyric_camera_hal,true)
|
|
$(call soong_config_set,google3a_config,gcam_awb,true)
|
|
$(call soong_config_set,google3a_config,ghawb_truetone,true)
|
|
|
|
# Flag controls whether Lyric apex can be located in the dist-directory.
|
|
$(call soong_config_set, lyric, dist_lyric_apex, $(RELEASE_PIXEL_DIST_LYRIC_APEX))
|
|
|
|
# Select GCH backend.
|
|
# TODO(b/192681010): This dependency inversion should be removed.
|
|
ifneq ($(wildcard vendor/google/services/LyricCameraHAL/src),)
|
|
$(call soong_config_set,gch,hwl_library,lyric)
|
|
endif
|
|
|
|
# Use build-time flag to select whether to build from source
|
|
# or ingest prebuilt-apex. We would want the development teams
|
|
# using release configuration: (trunk-staging) to build from source.
|
|
# All shipping releases will switch to prebuilts (trunk+)
|
|
# if this condition is not true, then build from source.
|
|
|
|
ifneq ($(RELEASE_PIXEL_CAMERA_ENABLE_PREBUILT),true)
|
|
|
|
PRODUCT_SOONG_NAMESPACES += \
|
|
vendor/google/camera \
|
|
vendor/google/camera/google_3a/libs_v4 \
|
|
vendor/google/camera/rlsservice
|
|
|
|
# TODO(b/257379485): 3A is incrementally enabling cuttlefish build for native
|
|
# code coverage support, temporary require separate namespace for folders that
|
|
# can be built successfully.
|
|
PRODUCT_SOONG_NAMESPACES += \
|
|
vendor/google/camera/common/g3_shared \
|
|
vendor/google/camera/google_3a/libs_v4/g3ABase \
|
|
vendor/google/camera/google_3a/libs_v4/gABC/native_coverage \
|
|
vendor/google/camera/google_3a/libs_v4/gAF \
|
|
vendor/google/camera/google_3a/libs_v4/gafd \
|
|
vendor/google/camera/google_3a/libs_v4/gHAWB/native_coverage
|
|
|
|
# Calibration tool for debug builds
|
|
PRODUCT_PACKAGES_ENG += tarasque_test
|
|
PRODUCT_PACKAGES_ENG += ProtoCalibGenerator
|
|
endif # RELEASE_PIXEL_CAMERA_ENABLE_PREBUILT check
|
|
|
|
# Init-time log settings for Google 3A
|
|
PRODUCT_PACKAGES += libg3a_standalone_gabc_rc
|
|
PRODUCT_PACKAGES += libg3a_standalone_gaf_rc
|
|
PRODUCT_PACKAGES += libg3a_standalone_ghawb_rc
|
|
|
|
# Vendor APEX which contains the camera HAL
|
|
PRODUCT_PACKAGES += com.google.pixel.camera.hal
|
|
PRODUCT_PACKAGES += init.camera.set-interrupts-ownership
|
|
PRODUCT_PACKAGES += lyric_preview_dis_xml
|
|
|
|
DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += \
|
|
device/google/gs-common/camera/device_framework_matrix_product.xml
|
|
|
|
DEVICE_MATRIX_FILE += \
|
|
device/google/gs-common/camera/compatibility_matrix.xml
|
|
|
|
# sepolicy dir is added in dump.mk.
|
|
# Make doesn't deduplicate sepolicy dirs, so including it here causes build errors.
|