Set Type-A HCE to Random UID am: 0881758b0b am: 01f2216035
am: 7afb5a9005
Change-Id: I6836198d8e7a58186bd14102c532ff691b5b64e0
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/device.mk b/device.mk
index f3a4787..8b5d33d 100644
--- a/device.mk
+++ b/device.mk
@@ -126,9 +126,10 @@
ro.vibrator.hal.tick.duration=4 \
ro.vibrator.hal.heavyclick.duration=12
-# Enable Perfetto traced
+# Enable Perfetto traced and heapprofd
PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
- persist.traced.enable=1
+ persist.traced.enable=1 \
+ persist.heapprofd.enable=1 \
# Early phase offset for SurfaceFlinger (b/75985430)
PRODUCT_PROPERTY_OVERRIDES += \
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/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
