Merge "Replace PHONE_CAR_BOARD_CONFIG with more specific PHONE_CAR_BOARD_PRODUCT" am: 50190420a8
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2065141
Change-Id: I5b85651b3d8297f4e271c3c60c56c0308dd7f579
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk
index e1ef669..5a05c40 100644
--- a/oriole/BoardConfig.mk
+++ b/oriole/BoardConfig.mk
@@ -13,8 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-ifdef PHONE_CAR_BOARD_CONFIG
- include $(PHONE_CAR_BOARD_CONFIG)
+ifdef PHONE_CAR_BOARD_PRODUCT
+ include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
else
TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt
TARGET_BOOTLOADER_BOARD_NAME := oriole
diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk
index c3f2cc7..4ff656e 100644
--- a/raven/BoardConfig.mk
+++ b/raven/BoardConfig.mk
@@ -14,8 +14,8 @@
# limitations under the License.
#
-ifdef PHONE_CAR_BOARD_CONFIG
- include $(PHONE_CAR_BOARD_CONFIG)
+ifdef PHONE_CAR_BOARD_PRODUCT
+ include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
else
TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt
TARGET_BOOTLOADER_BOARD_NAME := raven