DO NOT MERGE -- Merge PPRL.190405.003 into master
Bug: 130175407
Change-Id: Iefbd76b86d586032d3d8582335979dc3358c2269
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 654dafc..f189694 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -16,3 +16,6 @@
PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/aosp_taimen.mk \
+
+COMMON_LUNCH_CHOICES := \
+ aosp_taimen-userdebug
diff --git a/self-extractors/qcom/staging/device-partial.mk b/self-extractors/qcom/staging/device-partial.mk
index 00607ef..e2f5787 100644
--- a/self-extractors/qcom/staging/device-partial.mk
+++ b/self-extractors/qcom/staging/device-partial.mk
@@ -12,11 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# AOSP packages required by the blobs
-PRODUCT_PACKAGES := \
- com.android.ims.rcsmanager.xml \
- com.android.ims.rcsmanager
-
# blob(s) necessary for Taimen hardware
PRODUCT_COPY_FILES := \
vendor/qcom/taimen/proprietary/ATT_profiles.xml:system/etc/cne/Nexus/ATT/ATT_profiles.xml:qcom \
diff --git a/vendorsetup.sh b/vendorsetup.sh
deleted file mode 100755
index 39058a8..0000000
--- a/vendorsetup.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright 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.
-#
-
-add_lunch_combo aosp_taimen-userdebug
