diff options
author | Mark Grady <gradymark@google.com> | 2019-12-17 16:01:22 -0800 |
---|---|---|
committer | Mark Grady <gradymark@google.com> | 2019-12-20 22:47:36 +0000 |
commit | 0d89f954320bcc2e99641b8773acb81734b12801 (patch) | |
tree | c568e1d14d67762bb19732532d5abd8b81c2be0f | |
parent | 3f0938ab74e20dbcbc613f4f49db16971754fa9c (diff) | |
download | device_generic_car-0d89f954320bcc2e99641b8773acb81734b12801.tar.gz device_generic_car-0d89f954320bcc2e99641b8773acb81734b12801.tar.bz2 device_generic_car-0d89f954320bcc2e99641b8773acb81734b12801.zip |
Reapply "Add car audio emu support to aosp_car_* targets"
This reverts commit 52cf1a678cf3a6b232810e3f205b093784eaae93.
Bug:130232630
Test: Compile emulator and verify functionality
Change-Id: I3241eb07c89b25081cdea089884bf8b612e52522
-rw-r--r-- | aosp_car_arm.mk | 2 | ||||
-rw-r--r-- | aosp_car_arm64.mk | 2 | ||||
-rw-r--r-- | aosp_car_x86.mk | 2 | ||||
-rw-r--r-- | aosp_car_x86_64.mk | 2 | ||||
-rw-r--r-- | car_x86_64.mk | 2 | ||||
-rw-r--r-- | emulator/aosp_car_emulator.mk | 19 |
6 files changed, 24 insertions, 5 deletions
diff --git a/aosp_car_arm.mk b/aosp_car_arm.mk index 0db4952..9698d61 100644 --- a/aosp_car_arm.mk +++ b/aosp_car_arm.mk @@ -15,7 +15,7 @@ PRODUCT_PACKAGE_OVERLAYS := device/generic/car/common/overlay -$(call inherit-product, device/generic/car/common/car.mk) +$(call inherit-product, device/generic/car/emulator/aosp_car_emulator.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_arm.mk) PRODUCT_NAME := aosp_car_arm diff --git a/aosp_car_arm64.mk b/aosp_car_arm64.mk index 1c33928..682f9b1 100644 --- a/aosp_car_arm64.mk +++ b/aosp_car_arm64.mk @@ -15,7 +15,7 @@ PRODUCT_PACKAGE_OVERLAYS := device/generic/car/common/overlay -$(call inherit-product, device/generic/car/common/car.mk) +$(call inherit-product, device/generic/car/emulator/aosp_car_emulator.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_arm64.mk) PRODUCT_NAME := aosp_car_arm64 diff --git a/aosp_car_x86.mk b/aosp_car_x86.mk index 7c358ec..f6138c0 100644 --- a/aosp_car_x86.mk +++ b/aosp_car_x86.mk @@ -15,7 +15,7 @@ PRODUCT_PACKAGE_OVERLAYS := device/generic/car/common/overlay -$(call inherit-product, device/generic/car/common/car.mk) +$(call inherit-product, device/generic/car/emulator/aosp_car_emulator.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86.mk) PRODUCT_NAME := aosp_car_x86 diff --git a/aosp_car_x86_64.mk b/aosp_car_x86_64.mk index 6066d87..360a349 100644 --- a/aosp_car_x86_64.mk +++ b/aosp_car_x86_64.mk @@ -15,7 +15,7 @@ PRODUCT_PACKAGE_OVERLAYS := device/generic/car/common/overlay -$(call inherit-product, device/generic/car/common/car.mk) +$(call inherit-product, device/generic/car/emulator/aosp_car_emulator.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_x86_64.mk) PRODUCT_NAME := aosp_car_x86_64 diff --git a/car_x86_64.mk b/car_x86_64.mk index 82b2565..3832149 100644 --- a/car_x86_64.mk +++ b/car_x86_64.mk @@ -15,7 +15,7 @@ PRODUCT_PACKAGE_OVERLAYS := device/generic/car/common/overlay -$(call inherit-product, device/generic/car/common/car.mk) +$(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/audio/car_emulator_audio.mk) diff --git a/emulator/aosp_car_emulator.mk b/emulator/aosp_car_emulator.mk new file mode 100644 index 0000000..04f9031 --- /dev/null +++ b/emulator/aosp_car_emulator.mk @@ -0,0 +1,19 @@ +# +# Copyright (C) 2019 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +$(call inherit-product, device/generic/car/common/car.mk) +# This overrides device/generic/car/common/car.mk +$(call inherit-product, device/generic/car/emulator/audio/car_emulator_audio.mk) + |