DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
Bug: 120502534
Change-Id: I457f7ae5ba1dd3e9eb0c7977876649d5a058265d
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 9357a8a..0ae0891 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -17,3 +17,7 @@
PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/aosp_walleye.mk \
$(LOCAL_DIR)/aosp_walleye_test.mk \
+
+COMMON_LUNCH_CHOICES := \
+ aosp_walleye-userdebug \
+ aosp_walleye_test-userdebug
diff --git a/nfc/libnfc-nxp.muskie.conf b/nfc/libnfc-nxp.muskie.conf
index d1e530e..54ca8d4 100644
--- a/nfc/libnfc-nxp.muskie.conf
+++ b/nfc/libnfc-nxp.muskie.conf
@@ -14,7 +14,7 @@
NXPLOG_NCIR_LOGLEVEL=0x01
NXPLOG_FWDNLD_LOGLEVEL=0x01
NXPLOG_TML_LOGLEVEL=0x01
-NFC_DEBUG_ENABLED=0x01
+NFC_DEBUG_ENABLED=0x00
###############################################################################
# Nfc Device Node name
diff --git a/self-extractors/qcom/staging/device-partial.mk b/self-extractors/qcom/staging/device-partial.mk
index d5b387b..2fc2735 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 Walleye hardware
PRODUCT_COPY_FILES := \
vendor/qcom/walleye/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 2d8c55b..0000000
--- a/vendorsetup.sh
+++ /dev/null
@@ -1,18 +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_walleye-userdebug
-add_lunch_combo aosp_walleye_test-userdebug
