Merge "marlin: move vendor AB_OTA_PARTITIONS config to vendor" into n…

…yc-mr1-dev
LineageOS · Jun 21, 2016 · 33854b1 · 33854b1
2 parents 0c73f61 + f65f85a
commit 33854b1
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 6 deletions.
diff --git a/device-common.mk b/device-common.mk
@@ -310,8 +310,7 @@ PRODUCT_PACKAGES_DEBUG += \
 # more partitions to this list for the bootloader and radio.
 AB_OTA_PARTITIONS += \
     boot \
-    system \
-    vendor
+    system
 
 # NFC packages
 PRODUCT_PACKAGES += \

diff --git a/marlin/BoardConfig.mk b/marlin/BoardConfig.mk
@@ -180,8 +180,6 @@ TARGET_USE_VERIZON_APN_LIB_PREBUILT := true
 TARGET_BOARD_KERNEL_HEADERS := device/google/marlin/kernel-headers
 
 -include vendor/google_devices/marlin/BoardConfigVendor.mk
-# Build a separate vendor.img
-TARGET_COPY_OUT_VENDOR := vendor
 
 #NFC
 NXP_CHIP_TYPE := PN551
diff --git a/sailfish/BoardConfig.mk b/sailfish/BoardConfig.mk
@@ -177,8 +177,6 @@ TARGET_USE_VERIZON_APN_LIB_PREBUILT := true
 TARGET_BOARD_KERNEL_HEADERS := device/google/marlin/kernel-headers
 
 -include vendor/google_devices/marlin/BoardConfigVendor.mk
-# Build a separate vendor.img
-TARGET_COPY_OUT_VENDOR := vendor
 
 #NFC
 NXP_CHIP_TYPE := PN551