diff options
| author | Cole Faust <colefaust@google.com> | 2021-11-15 14:56:17 -0800 |
|---|---|---|
| committer | Cole Faust <colefaust@google.com> | 2022-04-14 13:42:32 -0700 |
| commit | c5ae906789b9fbf9135ad71636a6f9ec7e9fe916 (patch) | |
| tree | 994e5b40b0a7f6bf1fecc8da0ea97d1aaebbf330 | |
| parent | 7eafd55e2c59144734bf3c1b7947100635471ec0 (diff) | |
| download | google_car-c5ae906789b9fbf9135ad71636a6f9ec7e9fe916.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: I2f3d472073458171e5f3b5a95217efd6cb756e87
| -rw-r--r-- | oriole_car/device-oriole-car.mk | 2 | ||||
| -rw-r--r-- | raven_car/device-raven-car.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/oriole_car/device-oriole-car.mk b/oriole_car/device-oriole-car.mk index e37b6b8..0922e3f 100644 --- a/oriole_car/device-oriole-car.mk +++ b/oriole_car/device-oriole-car.mk @@ -14,7 +14,7 @@ # limitations under the License. # -PHONE_CAR_BOARD_CONFIG := device/google_car/oriole_car/BoardConfig.mk +PHONE_CAR_BOARD_PRODUCT := oriole_car $(call inherit-product, packages/services/Car/car_product/build/car.mk) diff --git a/raven_car/device-raven-car.mk b/raven_car/device-raven-car.mk index 75c751f..7ca5caf 100644 --- a/raven_car/device-raven-car.mk +++ b/raven_car/device-raven-car.mk @@ -14,7 +14,7 @@ # limitations under the License. # -PHONE_CAR_BOARD_CONFIG := device/google_car/raven_car/BoardConfig.mk +PHONE_CAR_BOARD_PRODUCT := raven_car $(call inherit-product, packages/services/Car/car_product/build/car.mk) |