diff options
| author | Ulya Trafimovich <skvadrik@google.com> | 2020-01-20 13:53:42 +0000 |
|---|---|---|
| committer | Ulya Trafimovich <skvadrik@google.com> | 2020-01-21 13:01:05 +0000 |
| commit | 004fde10b40df6ed498671253cefff6507a2ec83 (patch) | |
| tree | c335943366da94062d41c18a953e7f1f0cafc6c8 /car_x86_64.mk | |
| parent | 2031a5ca659b03085ad4c10f0608da8a35b45f69 (diff) | |
| download | car-004fde10b40df6ed498671253cefff6507a2ec83.tar.gz | |
Include core makefile before device-specific one.
The reverse order (car-specific makefile before the core one) causes
incorrect order of jars in the PRODUCT_SYSTEM_SERVER_JARS variable.
Namely, the car-specific jar 'car-framework-service' comes before the
core jar 'services'. This order is problematic for the build system,
because 'car-framework-service' depends on 'services'.
Test: $(ANDROID_BUILD_TOP)/vendor/google/build/build_test.bash --dist --incremental --shard-count=3 --shard=2
Test: lunch aosp_car_arm && m
Test: lunch aosp_car_arm64 && m
Test: lunch aosp_car_x86 && m
Test: lunch aosp_car_x86_64 && m
Test: lunch car_x86_64 && m
Change-Id: Iafb4d62c177eff5b15d28a4f0e55f027c55c9861
Diffstat (limited to 'car_x86_64.mk')
| -rw-r--r-- | car_x86_64.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/car_x86_64.mk b/car_x86_64.mk index 3832149..8a4cf35 100644 --- a/car_x86_64.mk +++ b/car_x86_64.mk @@ -15,8 +15,8 @@ PRODUCT_PACKAGE_OVERLAYS := device/generic/car/common/overlay -$(call inherit-product, device/generic/car/emulator/aosp_car_emulator.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86_64.mk) +$(call inherit-product, device/generic/car/emulator/aosp_car_emulator.mk) $(call inherit-product, device/generic/car/emulator/audio/car_emulator_audio.mk) PRODUCT_SDK_ADDON_NAME := car_emu_x86_64 |