Evolution-X-Tensor/device_google_caimito
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge changes from topic "337161745_prebuilt_directory_control_by_build_flag" into 24D1-dev

Browse source 
* changes:
  Switch bootloader and radio directory to control by build flag
  Switch kernel directory to control by build flag
This commit is contained in:
Robin Peng 2024-05-08 09:56:26 +00:00 • committed by Android (Google) Code Review
commit 9fb7c94da0
5 changed files with 85 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
device-caiman.mk
View file

@ -14,8 +14,23 @@
# limitations under the License.
#
TARGET_KERNEL_DIR ?= device/google/caimito-kernel
TARGET_BOARD_KERNEL_HEADERS := device/google/caimito-kernel/kernel-headers
ifdef RELEASE_GOOGLE_CAIMAN_RADIO_DIR
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_CAIMAN_RADIO_DIR)
endif
ifdef RELEASE_GOOGLE_CAIMAN_RADIOCFG_DIR
RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_CAIMAN_RADIOCFG_DIR)
endif
RELEASE_GOOGLE_BOOTLOADER_CAIMAN_DIR ?= 24D1# Keep this for pdk TODO: b/327119000
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CAIMAN_DIR)
$(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CAIMAN_DIR))
ifdef RELEASE_GOOGLE_CAIMAN_KERNEL_DIR
TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_CAIMAN_KERNEL_DIR)
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_CAIMAN_KERNEL_DIR)/kernel-headers
else
TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1
TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers
endif
LOCAL_PATH := device/google/caimito

19
device-komodo.mk
View file

@ -14,8 +14,23 @@
# limitations under the License.
#
TARGET_KERNEL_DIR ?= device/google/caimito-kernel
TARGET_BOARD_KERNEL_HEADERS := device/google/caimito-kernel/kernel-headers
ifdef RELEASE_GOOGLE_KOMODO_RADIO_DIR
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_KOMODO_RADIO_DIR)
endif
ifdef RELEASE_GOOGLE_KOMODO_RADIOCFG_DIR
RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_KOMODO_RADIOCFG_DIR)
endif
RELEASE_GOOGLE_BOOTLOADER_KOMODO_DIR ?= 24D1# Keep this for pdk TODO: b/327119000
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_KOMODO_DIR)
$(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_KOMODO_DIR))
ifdef RELEASE_GOOGLE_KOMODO_KERNEL_DIR
TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_KOMODO_KERNEL_DIR)
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_KOMODO_KERNEL_DIR)/kernel-headers
else
TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1
TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers
endif
LOCAL_PATH := device/google/caimito

19
device-ripcurrent24.mk
View file

@ -14,8 +14,23 @@
# limitations under the License.
#
TARGET_KERNEL_DIR ?= device/google/caimito-kernel
TARGET_BOARD_KERNEL_HEADERS := device/google/caimito-kernel/kernel-headers
ifdef RELEASE_GOOGLE_RIPCURRENT24_RADIO_DIR
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RIPCURRENT24_RADIO_DIR)
endif
ifdef RELEASE_GOOGLE_RIPCURRENT24_RADIOCFG_DIR
RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_RIPCURRENT24_RADIOCFG_DIR)
endif
RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT24_DIR ?= 24D1# Keep this for pdk TODO: b/327119000
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT24_DIR)
$(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT24_DIR))
ifdef RELEASE_GOOGLE_RIPCURRENT24_KERNEL_DIR
TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_RIPCURRENT24_KERNEL_DIR)
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_RIPCURRENT24_KERNEL_DIR)/kernel-headers
else
TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1
TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers
endif
$(call inherit-product-if-exists, vendor/google_devices/caimito/prebuilts/device-vendor-ripcurrent24.mk)
$(call inherit-product-if-exists, vendor/google_devices/zumapro/prebuilts/device-vendor.mk)

19
device-ripcurrentpro.mk
View file

@ -14,8 +14,23 @@
# limitations under the License.
#
TARGET_KERNEL_DIR ?= device/google/caimito-kernel
TARGET_BOARD_KERNEL_HEADERS := device/google/caimito-kernel/kernel-headers
ifdef RELEASE_GOOGLE_RIPCURRENTPRO_RADIO_DIR
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RIPCURRENTPRO_RADIO_DIR)
endif
ifdef RELEASE_GOOGLE_RIPCURRENTPRO_RADIOCFG_DIR
RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_RIPCURRENTPRO_RADIOCFG_DIR)
endif
RELEASE_GOOGLE_BOOTLOADER_RIPCURRENTPRO_DIR ?= 24D1# Keep this for pdk TODO: b/327119000
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENTPRO_DIR)
$(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENTPRO_DIR))
ifdef RELEASE_GOOGLE_RIPCURRENTPRO_KERNEL_DIR
TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_RIPCURRENTPRO_KERNEL_DIR)
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_RIPCURRENTPRO_KERNEL_DIR)/kernel-headers
else
TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1
TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers
endif
USE_SWIFTSHADER := false
BOARD_USES_SWIFTSHADER := false

19
device-tokay.mk
View file

@ -14,8 +14,23 @@
# limitations under the License.
#
TARGET_KERNEL_DIR ?= device/google/caimito-kernel
TARGET_BOARD_KERNEL_HEADERS := device/google/caimito-kernel/kernel-headers
ifdef RELEASE_GOOGLE_TOKAY_RADIO_DIR
RELEASE_GOOGLE_PRODUCT_RADIO_DIR ?= $(RELEASE_GOOGLE_TOKAY_RADIO_DIR)
endif
ifdef RELEASE_GOOGLE_TOKAY_RADIOCFG_DIR
RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR ?= $(RELEASE_GOOGLE_TOKAY_RADIOCFG_DIR)
endif
RELEASE_GOOGLE_BOOTLOADER_TOKAY_DIR ?= 24D1# Keep this for pdk TODO: b/327119000
RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_TOKAY_DIR)
$(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_TOKAY_DIR))
ifdef RELEASE_GOOGLE_TOKAY_KERNEL_DIR
TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_TOKAY_KERNEL_DIR)
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_TOKAY_KERNEL_DIR)/kernel-headers
else
TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1
TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers
endif
$(call inherit-product-if-exists, vendor/google_devices/caimito/prebuilts/device-vendor-tokay.mk)
$(call inherit-product-if-exists, vendor/google_devices/zumapro/prebuilts/device-vendor.mk)