Snap for 12337407 from 63cca28cc5
to 25Q1-release
Change-Id: Idc32d946a8361dfe1f76e21abb44cdafdb7a349b
This commit is contained in:
commit
e32d3dc46d
21 changed files with 100 additions and 95 deletions
|
@ -17,16 +17,6 @@
|
||||||
# Enable load module in parallel
|
# Enable load module in parallel
|
||||||
BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true
|
BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true
|
||||||
|
|
||||||
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_CHEETAH_RADIO_DIR)
|
|
||||||
RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR ?= pdk# Keep this for pdk TODO: b/327119000
|
|
||||||
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)
|
|
||||||
$(call soong_config_set,pantah_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR))
|
|
||||||
ifneq ($(filter trunk%, $(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)),)
|
|
||||||
$(call soong_config_set,pantah_fingerprint,prebuilt_dir,trunk)
|
|
||||||
else
|
|
||||||
$(call soong_config_set,pantah_fingerprint,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR))
|
|
||||||
endif
|
|
||||||
|
|
||||||
# The modules which need to be loaded in sequential
|
# The modules which need to be loaded in sequential
|
||||||
BOARD_KERNEL_CMDLINE += fips140.load_sequential=1
|
BOARD_KERNEL_CMDLINE += fips140.load_sequential=1
|
||||||
BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
|
BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
|
||||||
|
@ -40,6 +30,13 @@ BOARD_KERNEL_CMDLINE += swiotlb=noforce
|
||||||
|
|
||||||
include device/google/gs201/BoardConfig-common.mk
|
include device/google/gs201/BoardConfig-common.mk
|
||||||
-include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk
|
-include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk
|
||||||
|
include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
|
||||||
-include vendor/google_devices/cheetah/proprietary/BoardConfigVendor.mk
|
-include vendor/google_devices/cheetah/proprietary/BoardConfigVendor.mk
|
||||||
include device/google/pantah-sepolicy/cheetah-sepolicy.mk
|
include device/google/pantah-sepolicy/cheetah-sepolicy.mk
|
||||||
include device/google/pantah/wifi/BoardConfig-wifi.mk
|
include device/google/pantah/wifi/BoardConfig-wifi.mk
|
||||||
|
|
||||||
|
ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
|
||||||
|
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
|
||||||
|
-include device/google/common/etm/BoardUserdebugModules.mk
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
|
@ -15,19 +15,12 @@
|
||||||
#
|
#
|
||||||
TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt
|
TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt
|
||||||
TARGET_BOOTLOADER_BOARD_NAME := cloudripper
|
TARGET_BOOTLOADER_BOARD_NAME := cloudripper
|
||||||
RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR ?= pdk# Keep this for pdk TODO: b/327119000
|
|
||||||
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)
|
|
||||||
$(call soong_config_set,pantah_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR))
|
|
||||||
ifneq ($(filter trunk%, $(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)),)
|
|
||||||
$(call soong_config_set,pantah_fingerprint,prebuilt_dir,trunk)
|
|
||||||
else
|
|
||||||
$(call soong_config_set,pantah_fingerprint,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR))
|
|
||||||
endif
|
|
||||||
TARGET_SCREEN_DENSITY := 440
|
TARGET_SCREEN_DENSITY := 440
|
||||||
BOARD_USES_GENERIC_AUDIO := true
|
BOARD_USES_GENERIC_AUDIO := true
|
||||||
USES_DEVICE_GOOGLE_CLOUDRIPPER := true
|
USES_DEVICE_GOOGLE_CLOUDRIPPER := true
|
||||||
|
|
||||||
include device/google/gs201/BoardConfig-common.mk
|
include device/google/gs201/BoardConfig-common.mk
|
||||||
-include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk
|
-include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk
|
||||||
|
include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
|
||||||
include device/google/pantah-sepolicy/cloudripper-sepolicy.mk
|
include device/google/pantah-sepolicy/cloudripper-sepolicy.mk
|
||||||
include device/google/pantah/wifi/BoardConfig-wifi.mk
|
include device/google/pantah/wifi/BoardConfig-wifi.mk
|
||||||
|
|
|
@ -17,6 +17,19 @@
|
||||||
# Restrict the visibility of Android.bp files to improve build analysis time
|
# Restrict the visibility of Android.bp files to improve build analysis time
|
||||||
$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
|
$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
|
||||||
|
|
||||||
|
ifdef RELEASE_GOOGLE_CHEETAH_RADIO_DIR
|
||||||
|
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_CHEETAH_RADIO_DIR)
|
||||||
|
endif
|
||||||
|
RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR ?= pdk# Keep this for pdk TODO: b/327119000
|
||||||
|
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)
|
||||||
|
$(call soong_config_set,pantah_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR))
|
||||||
|
ifneq ($(filter trunk%, $(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)),)
|
||||||
|
$(call soong_config_set,pantah_fingerprint,prebuilt_dir,trunk)
|
||||||
|
else
|
||||||
|
$(call soong_config_set,pantah_fingerprint,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR))
|
||||||
|
endif
|
||||||
|
|
||||||
|
|
||||||
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_CHEETAH_VERSION)
|
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_CHEETAH_VERSION)
|
||||||
# Keeps flexibility for kasan and ufs builds
|
# Keeps flexibility for kasan and ufs builds
|
||||||
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CHEETAH_DIR)
|
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CHEETAH_DIR)
|
||||||
|
@ -453,5 +466,13 @@ PRODUCT_PRODUCT_PROPERTIES += \
|
||||||
ro.quick_start.device_id=cheetah
|
ro.quick_start.device_id=cheetah
|
||||||
|
|
||||||
# Bluetooth device id
|
# Bluetooth device id
|
||||||
|
# Cheetah: 0x410A
|
||||||
PRODUCT_PRODUCT_PROPERTIES += \
|
PRODUCT_PRODUCT_PROPERTIES += \
|
||||||
bluetooth.device_id.product_id=20490
|
bluetooth.device_id.product_id=16650
|
||||||
|
|
||||||
|
# ETM
|
||||||
|
ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
|
||||||
|
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
|
||||||
|
$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
|
||||||
|
endif
|
||||||
|
endif
|
|
@ -17,6 +17,16 @@
|
||||||
# Restrict the visibility of Android.bp files to improve build analysis time
|
# Restrict the visibility of Android.bp files to improve build analysis time
|
||||||
$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
|
$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
|
||||||
|
|
||||||
|
RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR ?= pdk# Keep this for pdk TODO: b/327119000
|
||||||
|
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)
|
||||||
|
$(call soong_config_set,pantah_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR))
|
||||||
|
ifneq ($(filter trunk%, $(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)),)
|
||||||
|
$(call soong_config_set,pantah_fingerprint,prebuilt_dir,trunk)
|
||||||
|
else
|
||||||
|
$(call soong_config_set,pantah_fingerprint,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR))
|
||||||
|
endif
|
||||||
|
|
||||||
|
|
||||||
# Keeps flexibility for kasan and ufs builds
|
# Keeps flexibility for kasan and ufs builds
|
||||||
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CHEETAH_DIR)
|
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CHEETAH_DIR)
|
||||||
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_CHEETAH_DIR)/kernel-headers
|
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_CHEETAH_DIR)/kernel-headers
|
||||||
|
|
|
@ -17,6 +17,19 @@
|
||||||
# Restrict the visibility of Android.bp files to improve build analysis time
|
# Restrict the visibility of Android.bp files to improve build analysis time
|
||||||
$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
|
$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
|
||||||
|
|
||||||
|
ifdef RELEASE_GOOGLE_PANTHER_RADIO_DIR
|
||||||
|
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_PANTHER_RADIO_DIR)
|
||||||
|
endif
|
||||||
|
RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR ?= pdk# Keep this for pdk TODO: b/327119000
|
||||||
|
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR)
|
||||||
|
$(call soong_config_set,pantah_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR))
|
||||||
|
ifneq ($(filter trunk%, $(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR)),)
|
||||||
|
$(call soong_config_set,pantah_fingerprint,prebuilt_dir,trunk)
|
||||||
|
else
|
||||||
|
$(call soong_config_set,pantah_fingerprint,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR))
|
||||||
|
endif
|
||||||
|
|
||||||
|
|
||||||
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_PANTHER_VERSION)
|
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_PANTHER_VERSION)
|
||||||
# Keeps flexibility for kasan and ufs builds
|
# Keeps flexibility for kasan and ufs builds
|
||||||
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_PANTHER_DIR)
|
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_PANTHER_DIR)
|
||||||
|
@ -436,5 +449,13 @@ PRODUCT_PRODUCT_PROPERTIES += \
|
||||||
ro.quick_start.device_id=panther
|
ro.quick_start.device_id=panther
|
||||||
|
|
||||||
# Bluetooth device id
|
# Bluetooth device id
|
||||||
|
# Panther: 0x4109
|
||||||
PRODUCT_PRODUCT_PROPERTIES += \
|
PRODUCT_PRODUCT_PROPERTIES += \
|
||||||
bluetooth.device_id.product_id=20489
|
bluetooth.device_id.product_id=16649
|
||||||
|
|
||||||
|
# ETM
|
||||||
|
ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
|
||||||
|
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
|
||||||
|
$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
|
@ -17,6 +17,16 @@
|
||||||
# Restrict the visibility of Android.bp files to improve build analysis time
|
# Restrict the visibility of Android.bp files to improve build analysis time
|
||||||
$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
|
$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
|
||||||
|
|
||||||
|
RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR ?= pdk# Keep this for pdk TODO: b/327119000
|
||||||
|
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)
|
||||||
|
$(call soong_config_set,pantah_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR))
|
||||||
|
ifneq ($(filter trunk%, $(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)),)
|
||||||
|
$(call soong_config_set,pantah_fingerprint,prebuilt_dir,trunk)
|
||||||
|
else
|
||||||
|
$(call soong_config_set,pantah_fingerprint,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR))
|
||||||
|
endif
|
||||||
|
|
||||||
|
|
||||||
# Keeps flexibility for kasan and ufs builds
|
# Keeps flexibility for kasan and ufs builds
|
||||||
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CHEETAH_DIR)
|
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CHEETAH_DIR)
|
||||||
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_CHEETAH_DIR)/kernel-headers
|
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_CHEETAH_DIR)/kernel-headers
|
||||||
|
|
|
@ -100,6 +100,8 @@
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<gll_features
|
<gll_features
|
||||||
|
EnableQzsAutoSwitch="false"
|
||||||
|
EnableGloAutoSwitch="false"
|
||||||
EnableNicAutoSwitch="true"
|
EnableNicAutoSwitch="true"
|
||||||
EnableNavic="true"
|
EnableNavic="true"
|
||||||
/>
|
/>
|
||||||
|
|
|
@ -100,6 +100,8 @@
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<gll_features
|
<gll_features
|
||||||
|
EnableQzsAutoSwitch="false"
|
||||||
|
EnableGloAutoSwitch="false"
|
||||||
EnableNicAutoSwitch="true"
|
EnableNicAutoSwitch="true"
|
||||||
EnableNavic="true"
|
EnableNavic="true"
|
||||||
/>
|
/>
|
||||||
|
|
|
@ -100,6 +100,8 @@
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<gll_features
|
<gll_features
|
||||||
|
EnableQzsAutoSwitch="false"
|
||||||
|
EnableGloAutoSwitch="false"
|
||||||
EnableNicAutoSwitch="true"
|
EnableNicAutoSwitch="true"
|
||||||
EnableNavic="true"
|
EnableNavic="true"
|
||||||
/>
|
/>
|
||||||
|
|
|
@ -100,6 +100,8 @@
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<gll_features
|
<gll_features
|
||||||
|
EnableQzsAutoSwitch="false"
|
||||||
|
EnableGloAutoSwitch="false"
|
||||||
EnableNicAutoSwitch="true"
|
EnableNicAutoSwitch="true"
|
||||||
EnableNavic="true"
|
EnableNavic="true"
|
||||||
/>
|
/>
|
||||||
|
|
|
@ -100,6 +100,8 @@
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<gll_features
|
<gll_features
|
||||||
|
EnableQzsAutoSwitch="false"
|
||||||
|
EnableGloAutoSwitch="false"
|
||||||
EnableNicAutoSwitch="true"
|
EnableNicAutoSwitch="true"
|
||||||
EnableNavic="true"
|
EnableNavic="true"
|
||||||
/>
|
/>
|
||||||
|
|
|
@ -98,6 +98,8 @@
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<gll_features
|
<gll_features
|
||||||
|
EnableQzsAutoSwitch="false"
|
||||||
|
EnableGloAutoSwitch="false"
|
||||||
EnableNicAutoSwitch="true"
|
EnableNicAutoSwitch="true"
|
||||||
EnableNavic="true"
|
EnableNavic="true"
|
||||||
/>
|
/>
|
||||||
|
|
|
@ -98,6 +98,8 @@
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<gll_features
|
<gll_features
|
||||||
|
EnableQzsAutoSwitch="false"
|
||||||
|
EnableGloAutoSwitch="false"
|
||||||
EnableNicAutoSwitch="true"
|
EnableNicAutoSwitch="true"
|
||||||
EnableNavic="true"
|
EnableNavic="true"
|
||||||
/>
|
/>
|
||||||
|
|
|
@ -98,6 +98,8 @@
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<gll_features
|
<gll_features
|
||||||
|
EnableQzsAutoSwitch="false"
|
||||||
|
EnableGloAutoSwitch="false"
|
||||||
EnableNicAutoSwitch="true"
|
EnableNicAutoSwitch="true"
|
||||||
EnableNavic="true"
|
EnableNavic="true"
|
||||||
/>
|
/>
|
||||||
|
|
|
@ -98,6 +98,8 @@
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<gll_features
|
<gll_features
|
||||||
|
EnableQzsAutoSwitch="false"
|
||||||
|
EnableGloAutoSwitch="false"
|
||||||
EnableNicAutoSwitch="true"
|
EnableNicAutoSwitch="true"
|
||||||
EnableNavic="true"
|
EnableNavic="true"
|
||||||
/>
|
/>
|
||||||
|
|
|
@ -98,6 +98,8 @@
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<gll_features
|
<gll_features
|
||||||
|
EnableQzsAutoSwitch="false"
|
||||||
|
EnableGloAutoSwitch="false"
|
||||||
EnableNicAutoSwitch="true"
|
EnableNicAutoSwitch="true"
|
||||||
EnableNavic="true"
|
EnableNavic="true"
|
||||||
/>
|
/>
|
||||||
|
|
|
@ -48,15 +48,6 @@
|
||||||
<instance>default</instance>
|
<instance>default</instance>
|
||||||
</interface>
|
</interface>
|
||||||
</hal>
|
</hal>
|
||||||
<hal format="hidl">
|
|
||||||
<name>android.hardware.graphics.mapper</name>
|
|
||||||
<transport arch="32+64">passthrough</transport>
|
|
||||||
<version>4.0</version>
|
|
||||||
<interface>
|
|
||||||
<name>IMapper</name>
|
|
||||||
<instance>default</instance>
|
|
||||||
</interface>
|
|
||||||
</hal>
|
|
||||||
<hal format="hidl">
|
<hal format="hidl">
|
||||||
<name>android.hardware.graphics.composer</name>
|
<name>android.hardware.graphics.composer</name>
|
||||||
<transport>hwbinder</transport>
|
<transport>hwbinder</transport>
|
||||||
|
|
|
@ -21,16 +21,6 @@ BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true
|
||||||
BOARD_KERNEL_CMDLINE += fips140.load_sequential=1
|
BOARD_KERNEL_CMDLINE += fips140.load_sequential=1
|
||||||
BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
|
BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
|
||||||
|
|
||||||
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_PANTHER_RADIO_DIR)
|
|
||||||
RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR ?= pdk# Keep this for pdk TODO: b/327119000
|
|
||||||
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR)
|
|
||||||
$(call soong_config_set,pantah_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR))
|
|
||||||
ifneq ($(filter trunk%, $(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR)),)
|
|
||||||
$(call soong_config_set,pantah_fingerprint,prebuilt_dir,trunk)
|
|
||||||
else
|
|
||||||
$(call soong_config_set,pantah_fingerprint,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_PANTHER_DIR))
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef PHONE_CAR_BOARD_PRODUCT
|
ifdef PHONE_CAR_BOARD_PRODUCT
|
||||||
include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
|
include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
|
||||||
else
|
else
|
||||||
|
@ -45,6 +35,13 @@ BOARD_KERNEL_CMDLINE += swiotlb=noforce
|
||||||
|
|
||||||
include device/google/gs201/BoardConfig-common.mk
|
include device/google/gs201/BoardConfig-common.mk
|
||||||
-include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk
|
-include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk
|
||||||
|
include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
|
||||||
-include vendor/google_devices/panther/proprietary/BoardConfigVendor.mk
|
-include vendor/google_devices/panther/proprietary/BoardConfigVendor.mk
|
||||||
include device/google/pantah-sepolicy/panther-sepolicy.mk
|
include device/google/pantah-sepolicy/panther-sepolicy.mk
|
||||||
include device/google/pantah/wifi/BoardConfig-wifi.mk
|
include device/google/pantah/wifi/BoardConfig-wifi.mk
|
||||||
|
|
||||||
|
ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
|
||||||
|
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
|
||||||
|
-include device/google/common/etm/BoardUserdebugModules.mk
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
|
@ -773,30 +773,6 @@
|
||||||
"Type": "DoHint",
|
"Type": "DoHint",
|
||||||
"Value": "LAUNCH_PMU"
|
"Value": "LAUNCH_PMU"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"PowerHint": "LAUNCH",
|
|
||||||
"Type": "DoHint",
|
|
||||||
"EnableProperty": "vendor.powerhal.camerarunning",
|
|
||||||
"Value": "CDCPUSET_RESTRICTED"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"PowerHint": "LAUNCH",
|
|
||||||
"Type": "DoHint",
|
|
||||||
"EnableProperty": "vendor.powerhal.camerarunning",
|
|
||||||
"Value": "CDHIGHCPUSETCPUS_RESTRICTED"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"PowerHint": "LAUNCH",
|
|
||||||
"Type": "DoHint",
|
|
||||||
"EnableProperty": "vendor.powerhal.camerarunning",
|
|
||||||
"Value": "CDMIDCPUSETCPUS_RESTRICTED"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"PowerHint": "LAUNCH",
|
|
||||||
"Type": "DoHint",
|
|
||||||
"EnableProperty": "vendor.powerhal.camerarunning",
|
|
||||||
"Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"PowerHint": "LAUNCH_PMU",
|
"PowerHint": "LAUNCH_PMU",
|
||||||
"Node": "PMU_POLL",
|
"Node": "PMU_POLL",
|
||||||
|
|
|
@ -762,30 +762,6 @@
|
||||||
"Type": "DoHint",
|
"Type": "DoHint",
|
||||||
"Value": "LAUNCH_PMU"
|
"Value": "LAUNCH_PMU"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"PowerHint": "LAUNCH",
|
|
||||||
"Type": "DoHint",
|
|
||||||
"EnableProperty": "vendor.powerhal.camerarunning",
|
|
||||||
"Value": "CDCPUSET_RESTRICTED"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"PowerHint": "LAUNCH",
|
|
||||||
"Type": "DoHint",
|
|
||||||
"EnableProperty": "vendor.powerhal.camerarunning",
|
|
||||||
"Value": "CDHIGHCPUSETCPUS_RESTRICTED"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"PowerHint": "LAUNCH",
|
|
||||||
"Type": "DoHint",
|
|
||||||
"EnableProperty": "vendor.powerhal.camerarunning",
|
|
||||||
"Value": "CDMIDCPUSETCPUS_RESTRICTED"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"PowerHint": "LAUNCH",
|
|
||||||
"Type": "DoHint",
|
|
||||||
"EnableProperty": "vendor.powerhal.camerarunning",
|
|
||||||
"Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"PowerHint": "LAUNCH_PMU",
|
"PowerHint": "LAUNCH_PMU",
|
||||||
"Node": "PMU_POLL",
|
"Node": "PMU_POLL",
|
||||||
|
|
|
@ -15,19 +15,12 @@
|
||||||
#
|
#
|
||||||
TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt
|
TARGET_BOARD_INFO_FILE := device/google/pantah/board-info.txt
|
||||||
TARGET_BOOTLOADER_BOARD_NAME := ravenclaw
|
TARGET_BOOTLOADER_BOARD_NAME := ravenclaw
|
||||||
RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR ?= pdk# Keep this for pdk TODO: b/327119000
|
|
||||||
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)
|
|
||||||
$(call soong_config_set,pantah_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR))
|
|
||||||
ifneq ($(filter trunk%, $(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR)),)
|
|
||||||
$(call soong_config_set,pantah_fingerprint,prebuilt_dir,trunk)
|
|
||||||
else
|
|
||||||
$(call soong_config_set,pantah_fingerprint,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CHEETAH_DIR))
|
|
||||||
endif
|
|
||||||
TARGET_SCREEN_DENSITY := 560
|
TARGET_SCREEN_DENSITY := 560
|
||||||
BOARD_USES_GENERIC_AUDIO := true
|
BOARD_USES_GENERIC_AUDIO := true
|
||||||
USES_DEVICE_GOOGLE_CLOUDRIPPER := true
|
USES_DEVICE_GOOGLE_CLOUDRIPPER := true
|
||||||
|
|
||||||
include device/google/gs201/BoardConfig-common.mk
|
include device/google/gs201/BoardConfig-common.mk
|
||||||
-include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk
|
-include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk
|
||||||
|
include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
|
||||||
include device/google/pantah-sepolicy/ravenclaw-sepolicy.mk
|
include device/google/pantah-sepolicy/ravenclaw-sepolicy.mk
|
||||||
include device/google/pantah/wifi/BoardConfig-wifi.mk
|
include device/google/pantah/wifi/BoardConfig-wifi.mk
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue