From 9fe54c39cdc15dd2722df0985872f37e10b52d49 Mon Sep 17 00:00:00 2001 From: Eric Jeong Date: Tue, 4 Aug 2020 18:17:08 -0700 Subject: Move non-Java projects into packages/services/Car/cpp - Non-java projects focusing on native app/service are relocated to packages/services/Car/cpp - Relevant configs are changed accordingly Bug: 162625217 Bug: 162896513 Test: Build okay Change-Id: Ied7cf51c0f109279b96a28463c5c8636e21c98ea --- aosp_trout_common.mk | 2 +- 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 -- cgit v1.2.3