Snap for 11740859 from f7fb3a0297
to 24Q3-release
Change-Id: I175533de648ddffbc6c80345af1c501dd8e88423
This commit is contained in:
commit
ad7324bc7f
3 changed files with 4 additions and 18 deletions
|
@ -262,15 +262,6 @@ PRODUCT_PACKAGES += \
|
||||||
|
|
||||||
# Trusty liboemcrypto.so
|
# Trusty liboemcrypto.so
|
||||||
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts
|
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts
|
||||||
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
|
|
||||||
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/24Q1
|
|
||||||
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
|
|
||||||
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/24Q2
|
|
||||||
else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION)))
|
|
||||||
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/24Q3
|
|
||||||
else
|
|
||||||
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/trunk
|
|
||||||
endif
|
|
||||||
|
|
||||||
# Set zram size
|
# Set zram size
|
||||||
PRODUCT_VENDOR_PROPERTIES += \
|
PRODUCT_VENDOR_PROPERTIES += \
|
||||||
|
|
|
@ -21,15 +21,9 @@ USES_DEVICE_GOOGLE_FELIX := true
|
||||||
BOARD_KERNEL_CMDLINE += swiotlb=noforce
|
BOARD_KERNEL_CMDLINE += swiotlb=noforce
|
||||||
|
|
||||||
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_FELIX_RADIO_DIR)
|
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_FELIX_RADIO_DIR)
|
||||||
ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
|
RELEASE_GOOGLE_BOOTLOADER_FELIX_DIR ?= trunk # Keep this for pdk TODO: b/327119000
|
||||||
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
|
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_FELIX_DIR)
|
||||||
else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
|
$(call soong_config_set,bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_FELIX_DIR))
|
||||||
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
|
|
||||||
else ifneq (,$(filter AP3%,$(RELEASE_PLATFORM_VERSION)))
|
|
||||||
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q3
|
|
||||||
else
|
|
||||||
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
|
|
||||||
endif
|
|
||||||
|
|
||||||
# Enable load module in parallel
|
# Enable load module in parallel
|
||||||
BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true
|
BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true
|
||||||
|
|
|
@ -60,6 +60,7 @@ cc_library {
|
||||||
srcs: [
|
srcs: [
|
||||||
"Vibrator.cpp",
|
"Vibrator.cpp",
|
||||||
],
|
],
|
||||||
|
shared_libs: ["//hardware/google/pixel:PixelVibratorFlagsL26"],
|
||||||
export_include_dirs: ["."],
|
export_include_dirs: ["."],
|
||||||
vendor_available: true,
|
vendor_available: true,
|
||||||
visibility: [":__subpackages__"],
|
visibility: [":__subpackages__"],
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue