DO NOT MERGE
Merge pie-platform-release (PPRL.181105.017, history only) into master
Bug: 118454372
Change-Id: I7d50cf8c92a0e933b421422ccfa02d73af535be0
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index eae3b59..50c5cad 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -19,3 +19,9 @@
$(LOCAL_DIR)/aosp_car_arm.mk \
$(LOCAL_DIR)/aosp_car_x86.mk \
$(LOCAL_DIR)/aosp_car_x86_64.mk \
+
+COMMON_LUNCH_CHOICES := \
+ aosp_car_arm-userdebug \
+ aosp_car_arm64-userdebug \
+ aosp_car_x86-userdebug \
+ aosp_car_x86_64-userdebug
diff --git a/common/manifest.xml b/common/manifest.xml
index 279c098..2faa498 100644
--- a/common/manifest.xml
+++ b/common/manifest.xml
@@ -194,15 +194,6 @@
</interface>
</hal>
<hal format="hidl">
- <name>android.hardware.cas</name>
- <transport>hwbinder</transport>
- <version>1.0</version>
- <interface>
- <name>IMediaCasService</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl">
<name>android.hardware.health</name>
<transport>hwbinder</transport>
<version>2.0</version>
diff --git a/vendorsetup.sh b/vendorsetup.sh
deleted file mode 100644
index 4e87161..0000000
--- a/vendorsetup.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Copyright (C) 2017 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.
-#
-
-# This file is executed by build/envsetup.sh, and can use anything
-# defined in envsetup.sh.
-#
-# In particular, you can add lunch options with the add_lunch_combo
-# function: add_lunch_combo generic-eng
-
-add_lunch_combo aosp_car_arm-userdebug
-add_lunch_combo aosp_car_arm64-userdebug
-add_lunch_combo aosp_car_x86-userdebug
-add_lunch_combo aosp_car_x86_64-userdebug
