Revert "Unhardcode vendor from OTA images"

This reverts commit e25cdf2.
anestisb · Jan 9, 2019 · 66cef87 · 66cef87
1 parent 697416b
commit 66cef87
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 16 deletions.
diff --git a/angler/config.json b/angler/config.json
@@ -6,9 +6,7 @@
   "aosp-vendor-dir": "huawei",
   "device-family": "angler",
   "supported-apis": ["api-23", "api-24", "api-25", "api-26", "api-27"],
-  "extra-partitions": [
-    "vendor"
-  ],
+  "extra-partitions": [],
   "AndroidMk": "angler/Android.mk",
   "BoardConfigVendorMk": "angler/BoardConfigVendor.mk",
   "DeviceVendorMk": "angler/device-vendor.mk",

diff --git a/blueline/config.json b/blueline/config.json
@@ -19,7 +19,6 @@
     "product",
     "qupfw",
     "tz",
-    "vendor",
     "xbl",
     "xbl_config"
   ],

diff --git a/bullhead/config.json b/bullhead/config.json
@@ -6,9 +6,7 @@
   "aosp-vendor-dir": "lge",
   "device-family": "bullhead",
   "supported-apis": ["api-23", "api-24", "api-25", "api-26", "api-27"],
-  "extra-partitions": [
-    "vendor"
-  ],
+  "extra-partitions": [],
   "AndroidMk": "bullhead/Android.mk",
   "BoardConfigVendorMk": "bullhead/BoardConfigVendor.mk",
   "DeviceVendorMk": "bullhead/device-vendor.mk",

diff --git a/crosshatch/config.json b/crosshatch/config.json
@@ -19,7 +19,6 @@
     "product",
     "qupfw",
     "tz",
-    "vendor",
     "xbl",
     "xbl_config"
   ],

diff --git a/flounder/config.json b/flounder/config.json
@@ -6,9 +6,7 @@
   "aosp-vendor-dir": "htc",
   "device-family": "flounder",
   "supported-apis": ["api-23", "api-24", "api-25"],
-  "extra-partitions": [
-    "vendor"
-  ],
+  "extra-partitions": [],
   "AndroidMk": "flounder/Android.mk",
   "BoardConfigVendorMk": "flounder/BoardConfigVendor.mk",
   "DeviceVendorMk": "flounder/device-vendor.mk",

diff --git a/marlin/config.json b/marlin/config.json
@@ -19,7 +19,6 @@
     "modem",
     "pmic",
     "rpm",
-    "vendor",
     "tz",
     "xbl"
   ],

diff --git a/sailfish/config.json b/sailfish/config.json
@@ -19,7 +19,6 @@
     "modem",
     "pmic",
     "rpm",
-    "vendor",
     "tz",
     "xbl"
   ],

diff --git a/scripts/generate-vendor.sh b/scripts/generate-vendor.sh
@@ -920,7 +920,7 @@ update_ab_ota_partitions() {
 
   {
     echo "# Partitions to add in AB OTA images"
-    echo 'AB_OTA_PARTITIONS += \'
+    echo 'AB_OTA_PARTITIONS += vendor \'
     for partition in "${EXTRA_IMGS[@]}"
     do
       echo "    $partition \\"

diff --git a/taimen/config.json b/taimen/config.json
@@ -18,7 +18,6 @@
     "modem",
     "pmic",
     "rpm",
-    "vendor",
     "tz",
     "xbl"
   ],

diff --git a/walleye/config.json b/walleye/config.json
@@ -18,7 +18,6 @@
     "msadp",
     "pmic",
     "rpm",
-    "vendor",
     "tz",
     "xbl"
   ],