diff options
author | Eric Jeong <ericjeong@google.com> | 2020-08-19 22:47:34 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-19 22:47:34 +0000 |
commit | 9c3245ff855afdc22ece3b03b6d29b2a692d0a78 (patch) | |
tree | 6f221727e502eddfca9d01610ba92b174e50656d | |
parent | 7b27bd1085b3c51e90322c4627a16f7efa49c7c6 (diff) | |
parent | 9fe54c39cdc15dd2722df0985872f37e10b52d49 (diff) | |
download | device_google_trout-9c3245ff855afdc22ece3b03b6d29b2a692d0a78.tar.gz device_google_trout-9c3245ff855afdc22ece3b03b6d29b2a692d0a78.tar.bz2 device_google_trout-9c3245ff855afdc22ece3b03b6d29b2a692d0a78.zip |
Move non-Java projects into packages/services/Car/cpp am: 9fe54c39cd
Original change: https://partner-android-review.googlesource.com/c/device/google/trout/+/1743650
Change-Id: Iee969b4434929be4b66f02cac195e47b43d9f984
-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 e29b3d5..641662a 100644 --- a/aosp_trout_common.mk +++ b/aosp_trout_common.mk @@ -56,4 +56,4 @@ 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/computepipe/products/computepipe.mk +include packages/services/Car/cpp/computepipe/products/computepipe.mk diff --git a/aosp_trout_x86.mk b/aosp_trout_x86.mk index 24ab4d7..349f55e 100644 --- a/aosp_trout_x86.mk +++ b/aosp_trout_x86.mk @@ -29,7 +29,7 @@ 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/computepipe/products/init.computepipe.rc:$(TARGET_COPY_OUT_SYSTEM)/etc/init/computepipe.rc + 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 |