diff options
| author | Xin Li <delphij@google.com> | 2019-06-14 13:09:48 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-14 13:09:48 -0700 |
| commit | 9ace241ea1379e83eabf8b679c2676472e46e378 (patch) | |
| tree | 1d35ddd524d111285b44cf8d59c8e34b188a2cd3 | |
| parent | 9b3da6ae8f44dc0bacc7063e1a1473ac2873cc1a (diff) | |
| parent | c6eb484fee67fbf56e6d69462ce0cd7285c91ec8 (diff) | |
| download | marlin-9ace241ea1379e83eabf8b679c2676472e46e378.tar.gz | |
Switch android-info to TARGET_BOARD_INFO_FILE. am: 42900d6dff
am: c6eb484fee
Change-Id: I8d9fcd8223e34ed31e7b91b995cb003100ed866f
| -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 |