Merge change 8517 into donut
* changes: Fix generic-userdebug build (don't build OTA for this target).
This commit is contained in:
@@ -893,6 +893,7 @@ target-files-package: $(BUILT_TARGET_FILES_PACKAGE)
|
|||||||
|
|
||||||
ifneq ($(TARGET_SIMULATOR),true)
|
ifneq ($(TARGET_SIMULATOR),true)
|
||||||
ifneq ($(TARGET_PRODUCT),sdk)
|
ifneq ($(TARGET_PRODUCT),sdk)
|
||||||
|
ifneq ($(TARGET_PRODUCT),generic)
|
||||||
|
|
||||||
name := $(TARGET_PRODUCT)
|
name := $(TARGET_PRODUCT)
|
||||||
ifeq ($(TARGET_BUILD_TYPE),debug)
|
ifeq ($(TARGET_BUILD_TYPE),debug)
|
||||||
@@ -914,6 +915,7 @@ $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) otatools
|
|||||||
.PHONY: otapackage
|
.PHONY: otapackage
|
||||||
otapackage: $(INTERNAL_OTA_PACKAGE_TARGET)
|
otapackage: $(INTERNAL_OTA_PACKAGE_TARGET)
|
||||||
|
|
||||||
|
endif # TARGET_PRODUCT != generic
|
||||||
endif # TARGET_PRODUCT != sdk
|
endif # TARGET_PRODUCT != sdk
|
||||||
endif # TARGET_SIMULATOR != true
|
endif # TARGET_SIMULATOR != true
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user