| commit | cae29e291561ea9b8b45fe35ef5974fe1911ae6d | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Mon Jul 08 12:36:00 2019 -0700 |
| committer | Bill Yi <byi@google.com> | Mon Jul 08 12:36:00 2019 -0700 |
| tree | 916b844530f49a970d936c67ee0c1f6461b94f22 | |
| parent | 55cd9537fd49928d92d3ec3d55285bb525243b87 [diff] |
The 'vendor' in AB_OTA_PARTITIONS should be in google_devices Clean up vendor BOARD_PREBUILT_VENDORIMAGE and android-info.mk. Those are defined in google_devices/. BUG: 134970317 Change-Id: Iab47a948896a3a9f524e654c5dcb8e19d4743efb
diff --git a/self-extractors_blueline/google_devices/staging/BoardConfigPartial.mk b/self-extractors_blueline/google_devices/staging/BoardConfigPartial.mk index d4af03b..bb8eb7b 100644 --- a/self-extractors_blueline/google_devices/staging/BoardConfigPartial.mk +++ b/self-extractors_blueline/google_devices/staging/BoardConfigPartial.mk
@@ -18,3 +18,6 @@ ifdef USE_ANDROID_INFO TARGET_BOARD_INFO_FILE := vendor/google_devices/blueline/android-info.txt endif + +AB_OTA_PARTITIONS += \ + vendor
diff --git a/self-extractors_blueline/qcom/staging/BoardConfigPartial.mk b/self-extractors_blueline/qcom/staging/BoardConfigPartial.mk index bb8eb7b..e0b4fa2 100644 --- a/self-extractors_blueline/qcom/staging/BoardConfigPartial.mk +++ b/self-extractors_blueline/qcom/staging/BoardConfigPartial.mk
@@ -11,13 +11,3 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - -BOARD_PREBUILT_VENDORIMAGE := vendor/google_devices/blueline/proprietary/vendor.img - --include vendor/google/tools/android-info.mk -ifdef USE_ANDROID_INFO - TARGET_BOARD_INFO_FILE := vendor/google_devices/blueline/android-info.txt -endif - -AB_OTA_PARTITIONS += \ - vendor