diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-10 22:37:33 +0000 |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2020-07-10 22:37:33 +0000 |
| commit | 22d05b8e1794d231e19a97b39c8aa353a9b57437 (patch) | |
| tree | 066642f0e66f351242f5d499e6e1e71d3903b57d | |
| parent | 6f17ad8093482367623e0cfc2c59e19a1d0f727b (diff) | |
| parent | 71d51f5a878c5db3cceca9311eb6d75968d60f38 (diff) | |
| download | device_google_trout-22d05b8e1794d231e19a97b39c8aa353a9b57437.tar.gz device_google_trout-22d05b8e1794d231e19a97b39c8aa353a9b57437.tar.bz2 device_google_trout-22d05b8e1794d231e19a97b39c8aa353a9b57437.zip | |
Merge "Build ComputePipe for trout" into rvc-devandroid11-dev
| -rw-r--r-- | aosp_trout_common.mk | 2 | ||||
| -rw-r--r-- | aosp_trout_x86.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/aosp_trout_common.mk b/aosp_trout_common.mk index 113e8dd..c4e5b50 100644 --- a/aosp_trout_common.mk +++ b/aosp_trout_common.mk @@ -37,3 +37,5 @@ PRODUCT_PROPERTY_OVERRIDES += \ ${LOCAL_DUMPSTATE_PROPERTIES} TARGET_BOARD_INFO_FILE ?= device/google/trout/board-info.txt + +include packages/services/Car/computepipe/products/computepipe.mk diff --git a/aosp_trout_x86.mk b/aosp_trout_x86.mk index 9c0c432..59fb9d9 100644 --- a/aosp_trout_x86.mk +++ b/aosp_trout_x86.mk @@ -18,8 +18,6 @@ $(call inherit-product, device/google/cuttlefish/vsoc_x86/auto/device.mk) include device/google/trout/aosp_trout_common.mk -include packages/services/Car/computepipe/products/computepipe.mk - 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 |