diff options
| author | Eric Jeong <ericjeong@google.com> | 2020-08-04 20:08:00 -0700 |
|---|---|---|
| committer | Eric Jeong <ericjeong@google.com> | 2020-08-04 20:14:02 -0700 |
| commit | 4485942f505f50462e3c4982efe69ffce09bcee6 (patch) | |
| tree | f3357d201dde453019da9e302156a6e040680431 | |
| parent | 9fe54c39cdc15dd2722df0985872f37e10b52d49 (diff) | |
| download | device_google_trout-4485942f505f50462e3c4982efe69ffce09bcee6.tar.gz device_google_trout-4485942f505f50462e3c4982efe69ffce09bcee6.tar.bz2 device_google_trout-4485942f505f50462e3c4982efe69ffce09bcee6.zip | |
Exclude computepipe from trout
- It's not possible to land a CL only for main.
- Computepipe has different directory structure in rvc-dev and main.
- For the time being, computepipe is excluded from trout, and will be
included once trout points to main.
Bug: 162896513
Test: build okay
Change-Id: I89e1c6752e7f546d158d775d835b6fcd0c6dc01d
| -rw-r--r-- | aosp_trout_common.mk | 3 | ||||
| -rw-r--r-- | aosp_trout_x86.mk | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/aosp_trout_common.mk b/aosp_trout_common.mk index 641662a..ae7ec53 100644 --- a/aosp_trout_common.mk +++ b/aosp_trout_common.mk @@ -56,4 +56,5 @@ LOCAL_AUDIO_PRODUCT_COPY_FILES ?= \ frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \ frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml -include packages/services/Car/cpp/computepipe/products/computepipe.mk +# TODO(b/162901005): Include computepipe once this project points to main. +# include packages/services/Car/cpp/computepipe/products/computepipe.mk diff --git a/aosp_trout_x86.mk b/aosp_trout_x86.mk index 349f55e..28bf246 100644 --- a/aosp_trout_x86.mk +++ b/aosp_trout_x86.mk @@ -28,8 +28,9 @@ DEVICE_MANIFEST_FILE += device/google/trout/manifest_x86.xml DEVICE_MATRIX_FILE += device/google/trout/compatibility_matrix.xml DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := device/google/trout/framework_compatibility_matrix.xml -PRODUCT_COPY_FILES += \ - packages/services/Car/cpp/computepipe/products/init.computepipe.rc:$(TARGET_COPY_OUT_SYSTEM)/etc/init/computepipe.rc +# TODO(b/162901005): Include computepipe once this project points to main. +# PRODUCT_COPY_FILES += \ +# packages/services/Car/cpp/computepipe/products/init.computepipe.rc:$(TARGET_COPY_OUT_SYSTEM)/etc/init/computepipe.rc PRODUCT_NAME := aosp_trout_x86 PRODUCT_DEVICE := vsoc_x86 |