diff options
| author | Xin Li <delphij@google.com> | 2019-06-14 12:55:19 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-14 12:55:19 -0700 |
| commit | c6eb484fee67fbf56e6d69462ce0cd7285c91ec8 (patch) | |
| tree | e5da42459397d0b236e6330787e11ee758e08d8d | |
| parent | b8efe77ca1cdfb3337e483c0be91bfdfd780e087 (diff) | |
| parent | 42900d6dff8dfd5787ced3eb9b4c0c342ef2ac90 (diff) | |
| download | marlin-c6eb484fee67fbf56e6d69462ce0cd7285c91ec8.tar.gz | |
Switch android-info to TARGET_BOARD_INFO_FILE.
am: 42900d6dff
Change-Id: I19975a5bb1d806e4ad82c58f87d2f46d9b8870fc
| -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 |