Merge "Replace PHONE_CAR_BOARD_CONFIG with more specific PHONE_CAR_BOARD_PRODUCT" am: 50190420a8 am: 9452525c5c

Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2065141

Change-Id: I619faa1257949c3c0bd5d6117589031d823ba3c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Cole Faust 2022-04-15 17:54:05 +00:00 committed by Automerger Merge Worker
commit 5401044873
2 changed files with 4 additions and 4 deletions

View file

@ -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

View file

@ -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