Merge "Replace PHONE_CAR_BOARD_CONFIG with more specific PHONE_CAR_BOARD_PRODUCT"

This commit is contained in:
Cole Faust 2022-04-15 17:11:34 +00:00 committed by Gerrit Code Review
commit 50190420a8
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 # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
ifdef PHONE_CAR_BOARD_CONFIG ifdef PHONE_CAR_BOARD_PRODUCT
include $(PHONE_CAR_BOARD_CONFIG) include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
else else
TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt
TARGET_BOOTLOADER_BOARD_NAME := oriole TARGET_BOOTLOADER_BOARD_NAME := oriole

View file

@ -14,8 +14,8 @@
# limitations under the License. # limitations under the License.
# #
ifdef PHONE_CAR_BOARD_CONFIG ifdef PHONE_CAR_BOARD_PRODUCT
include $(PHONE_CAR_BOARD_CONFIG) include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
else else
TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt
TARGET_BOOTLOADER_BOARD_NAME := raven TARGET_BOOTLOADER_BOARD_NAME := raven