diff options
| author | Xin Li <delphij@google.com> | 2019-06-14 09:34:23 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2019-06-14 09:54:07 -0700 |
| commit | 42900d6dff8dfd5787ced3eb9b4c0c342ef2ac90 (patch) | |
| tree | e5da42459397d0b236e6330787e11ee758e08d8d | |
| parent | 82b611489ae7364f7fca7dcc251476f51a6f5630 (diff) | |
| download | marlin-42900d6dff8dfd5787ced3eb9b4c0c342ef2ac90.tar.gz | |
Switch android-info to TARGET_BOARD_INFO_FILE.
Bug: 77611511
Change-Id: Ic6c07112b2a8508a29e14493bb15c7f4f76c3231
| -rw-r--r-- | self-extractors/google_devices/staging/BoardConfigPartial.mk | 5 | ||||
| -rw-r--r-- | self-extractors_sailfish/google_devices/staging/BoardConfigPartial.mk | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/self-extractors/google_devices/staging/BoardConfigPartial.mk b/self-extractors/google_devices/staging/BoardConfigPartial.mk index f8215556..cd3fb6ae 100644 --- a/self-extractors/google_devices/staging/BoardConfigPartial.mk +++ b/self-extractors/google_devices/staging/BoardConfigPartial.mk @@ -13,3 +13,8 @@ # limitations under the License. BOARD_PREBUILT_VENDORIMAGE := vendor/google_devices/marlin/proprietary/vendor.img + +-include vendor/google/tools/android-info.mk +ifdef USE_ANDROID_INFO + TARGET_BOARD_INFO_FILE := vendor/google_devices/marlin/android-info.txt +endif diff --git a/self-extractors_sailfish/google_devices/staging/BoardConfigPartial.mk b/self-extractors_sailfish/google_devices/staging/BoardConfigPartial.mk index 58ebcc85..3d4b7c25 100644 --- a/self-extractors_sailfish/google_devices/staging/BoardConfigPartial.mk +++ b/self-extractors_sailfish/google_devices/staging/BoardConfigPartial.mk @@ -13,3 +13,8 @@ # limitations under the License. BOARD_PREBUILT_VENDORIMAGE := vendor/google_devices/sailfish/proprietary/vendor.img + +-include vendor/google/tools/android-info.mk +ifdef USE_ANDROID_INFO + TARGET_BOARD_INFO_FILE := vendor/google_devices/sailfish/android-info.txt +endif |