Merge "Revert "Allow PRODUCT_16K_DEVELOPER_OPTION from other targets"" into main
This commit is contained in:
commit
1aae02e35a
3 changed files with 3 additions and 3 deletions
|
@ -37,7 +37,7 @@ TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CAIMAN_DIR)
|
||||||
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_CAIMAN_DIR)/kernel-headers
|
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_CAIMAN_DIR)/kernel-headers
|
||||||
|
|
||||||
ifneq ($(TARGET_BOOTS_16K),true)
|
ifneq ($(TARGET_BOOTS_16K),true)
|
||||||
PRODUCT_16K_DEVELOPER_OPTION ?= $(RELEASE_GOOGLE_CAIMAN_16K_DEVELOPER_OPTION)
|
PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_CAIMAN_16K_DEVELOPER_OPTION)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
include device/google/caimito/device-caimito-16k-common.mk
|
include device/google/caimito/device-caimito-16k-common.mk
|
||||||
|
|
|
@ -37,7 +37,7 @@ TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_KOMODO_DIR)
|
||||||
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_KOMODO_DIR)/kernel-headers
|
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_KOMODO_DIR)/kernel-headers
|
||||||
|
|
||||||
ifneq ($(TARGET_BOOTS_16K),true)
|
ifneq ($(TARGET_BOOTS_16K),true)
|
||||||
PRODUCT_16K_DEVELOPER_OPTION ?= $(RELEASE_GOOGLE_KOMODO_16K_DEVELOPER_OPTION)
|
PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_KOMODO_16K_DEVELOPER_OPTION)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
include device/google/caimito/device-caimito-16k-common.mk
|
include device/google/caimito/device-caimito-16k-common.mk
|
||||||
|
|
|
@ -37,7 +37,7 @@ TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_TOKAY_DIR)
|
||||||
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_TOKAY_DIR)/kernel-headers
|
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_TOKAY_DIR)/kernel-headers
|
||||||
|
|
||||||
ifneq ($(TARGET_BOOTS_16K),true)
|
ifneq ($(TARGET_BOOTS_16K),true)
|
||||||
PRODUCT_16K_DEVELOPER_OPTION ?= $(RELEASE_GOOGLE_TOKAY_16K_DEVELOPER_OPTION)
|
PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_TOKAY_16K_DEVELOPER_OPTION)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
include device/google/caimito/device-caimito-16k-common.mk
|
include device/google/caimito/device-caimito-16k-common.mk
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue