diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-13 16:34:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-13 16:34:15 +0000 |
| commit | 4a4c14de9eedf9c3a09c351cfc98bc0bb644da79 (patch) | |
| tree | da031ed7d598d600acecc7f0ed35c762ba5461ca | |
| parent | 534268a2e1d588625accdb67d58cc582aad9dfa4 (diff) | |
| parent | 601f3cb3e1719f2cdc3a7ace0b81331f5e6d4028 (diff) | |
| download | device_google_car-4a4c14de9eedf9c3a09c351cfc98bc0bb644da79.tar.gz device_google_car-4a4c14de9eedf9c3a09c351cfc98bc0bb644da79.tar.bz2 device_google_car-4a4c14de9eedf9c3a09c351cfc98bc0bb644da79.zip | |
Merge "Cosmetic fixes." into rvc-dev am: 601f3cb3e1
Change-Id: Ie9341b451df6738b5eb5786f7edbaaa0ee7a68b9
| -rw-r--r-- | OWNERS | 1 | ||||
| -rw-r--r-- | coral_car/BoardConfig.mk | 15 | ||||
| -rw-r--r-- | coral_car/audio_effects.xml | 14 | ||||
| -rw-r--r-- | coral_car/manifest.xml | 15 | ||||
| -rw-r--r-- | crosshatch_car/BoardConfig.mk | 15 | ||||
| -rw-r--r-- | crosshatch_car/aosp_crosshatch_car.mk | 4 | ||||
| -rw-r--r-- | crosshatch_car/audio_effects.xml | 14 | ||||
| -rw-r--r-- | crosshatch_car/manifest.xml | 15 |
8 files changed, 91 insertions, 2 deletions
@@ -1 +1,2 @@ sgaurav@google.com +felipeal@google.com diff --git a/coral_car/BoardConfig.mk b/coral_car/BoardConfig.mk index 61f37f2..29ba5ae 100644 --- a/coral_car/BoardConfig.mk +++ b/coral_car/BoardConfig.mk @@ -1,3 +1,18 @@ +# +# Copyright 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. +# # config.mk # # Product-specific compile-time definitions. diff --git a/coral_car/audio_effects.xml b/coral_car/audio_effects.xml index a0d30cf..9e6b862 100644 --- a/coral_car/audio_effects.xml +++ b/coral_car/audio_effects.xml @@ -1,4 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- 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. +--> <audio_effects_conf version="2.0" xmlns="http://schemas.android.com/audio/audio_effects_conf/v2_0"> <libraries> <library name="bundle" path="libbundlewrapper.so"/> diff --git a/coral_car/manifest.xml b/coral_car/manifest.xml index bbaeed0..b042667 100644 --- a/coral_car/manifest.xml +++ b/coral_car/manifest.xml @@ -1,3 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- 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. +--> <manifest version="1.0" type="framework" > <hal format="hidl"> <name>android.hardware.automotive.vehicle</name> diff --git a/crosshatch_car/BoardConfig.mk b/crosshatch_car/BoardConfig.mk index 61f37f2..29ba5ae 100644 --- a/crosshatch_car/BoardConfig.mk +++ b/crosshatch_car/BoardConfig.mk @@ -1,3 +1,18 @@ +# +# Copyright 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. +# # config.mk # # Product-specific compile-time definitions. diff --git a/crosshatch_car/aosp_crosshatch_car.mk b/crosshatch_car/aosp_crosshatch_car.mk index a51c5d3..611f516 100644 --- a/crosshatch_car/aosp_crosshatch_car.mk +++ b/crosshatch_car/aosp_crosshatch_car.mk @@ -48,13 +48,13 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ android.hardware.automotive.audiocontrol@1.0-service \ - android.hardware.automotive.evs@1.0-service + android.hardware.automotive.evs@1.0-service # Car init.rc PRODUCT_COPY_FILES += \ packages/services/Car/car_product/init/init.bootstat.rc:root/init.bootstat.rc \ packages/services/Car/car_product/init/init.car.rc:root/init.car.rc \ - $(LOCAL_PATH)/vendor/automotive.evs@1.0-service.rc:/vendor/etc/init/android.hardware.automotive.evs@1.0-service.rc + $(LOCAL_PATH)/vendor/automotive.evs@1.0-service.rc:/vendor/etc/init/android.hardware.automotive.evs@1.0-service.rc # Override heap growth limit due to high display density on device PRODUCT_PROPERTY_OVERRIDES += \ diff --git a/crosshatch_car/audio_effects.xml b/crosshatch_car/audio_effects.xml index a0d30cf..9e6b862 100644 --- a/crosshatch_car/audio_effects.xml +++ b/crosshatch_car/audio_effects.xml @@ -1,4 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- 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. +--> <audio_effects_conf version="2.0" xmlns="http://schemas.android.com/audio/audio_effects_conf/v2_0"> <libraries> <library name="bundle" path="libbundlewrapper.so"/> diff --git a/crosshatch_car/manifest.xml b/crosshatch_car/manifest.xml index 46b8b9c..0802c49 100644 --- a/crosshatch_car/manifest.xml +++ b/crosshatch_car/manifest.xml @@ -1,3 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- 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. +--> <manifest version="1.0" type="framework" > <hal format="hidl"> <name>android.hardware.automotive.vehicle</name> |