diff options
| author | Sasha Smundak <asmundak@google.com> | 2021-08-02 19:36:32 -0700 |
|---|---|---|
| committer | Cole Faust <colefaust@google.com> | 2021-12-03 11:00:45 -0800 |
| commit | 721e015b1854aa66a16bdc5d6bff28fe6066ed08 (patch) | |
| tree | 6adfb528939939d200db9037af8a4328533dc6fb | |
| parent | 46654ef4a78e940736a4da36ad056fe0eb082300 (diff) | |
| download | crosshatch-721e015b1854aa66a16bdc5d6bff28fe6066ed08.tar.gz | |
Replace PHONE_CAR_BOARD_CONFIG with more specific PHONE_CAR_BOARD_PRODUCT
The statement
```
include $(PHONE_CAR_BOARD_CONFIG)
```
is difficult to translate to the Starlark configuration file. Fortunately,
all the potential values of this variable have have similar structure, so
```
PHONE_CAR_BOARD_CONFIG := device/google_car/foo/BoardConfig.mk
....
include $(PHONE_CARD_BOARD_CONFIG)
```
can be changed to
```
PHONE_CAR_BOARD_PRODUCT := foo
....
include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
```
Bug: 190051051
Test: treehugger
Change-Id: Iaa0797417d43b7c91e1501b41cde89dd04ed502a
| -rw-r--r-- | blueline/BoardConfig.mk | 4 | ||||
| -rw-r--r-- | crosshatch/BoardConfig.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/blueline/BoardConfig.mk b/blueline/BoardConfig.mk index b9908963..1736bc69 100644 --- a/blueline/BoardConfig.mk +++ b/blueline/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_BOOTLOADER_BOARD_NAME := blueline TARGET_SCREEN_DENSITY := 440 diff --git a/crosshatch/BoardConfig.mk b/crosshatch/BoardConfig.mk index 828afd92..de920964 100644 --- a/crosshatch/BoardConfig.mk +++ b/crosshatch/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_BOOTLOADER_BOARD_NAME := crosshatch TARGET_SCREEN_DENSITY := 560 |