DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
Bug: 136196576
Change-Id: I1087539ffb3528d9c743845198fc99c7f07790c0
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/BoardConfig.mk b/BoardConfig.mk
index 6e39bd2..7c168c7 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -25,7 +25,7 @@
BOARD_AVB_ENABLE := true
# sepolicy
-BOARD_SEPOLICY_DIRS += device/google/taimen/sepolicy
+BOARD_VENDOR_SEPOLICY_DIRS += device/google/taimen/sepolicy
ifeq (,$(filter-out taimen_gcc, $(TARGET_PRODUCT)))
# if TARGET_PRODUCT == taimen_gcc
diff --git a/self-extractors/extract-lists.txt b/self-extractors/extract-lists.txt
index 1cc2a90..099f866 100644
--- a/self-extractors/extract-lists.txt
+++ b/self-extractors/extract-lists.txt
@@ -39,6 +39,5 @@
system/lib/libiperf.so \
system/lib/librcc.so \
system/xbin/iperf3 \
- system/xbin/sanitizer-status \
"
;;
diff --git a/self-extractors/google_devices/staging/BoardConfigPartial.mk b/self-extractors/google_devices/staging/BoardConfigPartial.mk
index fc1a83b..5f4f882 100644
--- a/self-extractors/google_devices/staging/BoardConfigPartial.mk
+++ b/self-extractors/google_devices/staging/BoardConfigPartial.mk
@@ -13,3 +13,8 @@
# limitations under the License.
BOARD_PREBUILT_VENDORIMAGE := vendor/google_devices/taimen/proprietary/vendor.img
+
+-include vendor/google/tools/android-info.mk
+ifdef USE_ANDROID_INFO
+ TARGET_BOARD_INFO_FILE := vendor/google_devices/taimen/android-info.txt
+endif
diff --git a/self-extractors/qcom/staging/device-partial.mk b/self-extractors/qcom/staging/device-partial.mk
index 00607ef..0f2a6b0 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 \
@@ -53,4 +48,3 @@
vendor/qcom/taimen/proprietary/libiperf.so:system/lib/libiperf.so:qcom \
vendor/qcom/taimen/proprietary/librcc.so:system/lib/librcc.so:qcom \
vendor/qcom/taimen/proprietary/iperf3:system/xbin/iperf3:qcom \
- vendor/qcom/taimen/proprietary/sanitizer-status:system/xbin/sanitizer-status: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
