Snap for 11135399 from c95b886595f9f5869466db093749aa53a3979ea1 to simpleperf-release

Change-Id: I504829788b6bb529edcec4adf5e54d55a79f907e

12 files changed, 4 insertions, 43 deletions

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index d717f678..bd23b5a9 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -27,5 +27,5 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/aosp_flame_hwasan.mk \
 
 COMMON_LUNCH_CHOICES := \
-    aosp_coral-userdebug \
-    aosp_flame-userdebug \
+    aosp_coral-trunk_staging-userdebug \
+    aosp_flame-trunk_staging-userdebug \
diff --git a/device.mk b/device.mk
index 88638f65..0e40ffcc 100644
--- a/device.mk
+++ b/device.mk
@@ -446,12 +446,11 @@ PRODUCT_PACKAGES += \
 
 # NFC and Secure Element packages
 PRODUCT_PACKAGES += \
-    com.android.nfcservices \
+    NfcNci \
     Tag \
     SecureElement \
     android.hardware.nfc-service.st \
-    android.hardware.secure_element@1.0-service.st \
-    NfcOverlayCoral
+    android.hardware.secure_element@1.0-service.st
 
 PRODUCT_COPY_FILES += \
     device/google/coral/nfc/com.google.hardware.pixel.japan.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_G020N/com.google.hardware.pixel.japan.xml \
diff --git a/rro_overlays/NfcOverlay/res/values/config.xml b/overlay/packages/apps/Nfc/res/values/config.xml
index 959bbed0..959bbed0 100644
--- a/rro_overlays/NfcOverlay/res/values/config.xml
+++ b/overlay/packages/apps/Nfc/res/values/config.xml
diff --git a/rro_overlays/NfcOverlay/Android.bp b/rro_overlays/NfcOverlay/Android.bp
deleted file mode 100644
index 7e56cd7b..00000000
--- a/rro_overlays/NfcOverlay/Android.bp
+++ /dev/null
@@ -1,9 +0,0 @@
-package {
-    default_applicable_licenses: ["device_google_coral_license"],
-}
-
-runtime_resource_overlay {
-    name: "NfcOverlayCoral",
-    sdk_version: "current",
-    product_specific: true
-}
diff --git a/rro_overlays/NfcOverlay/AndroidManifest.xml b/rro_overlays/NfcOverlay/AndroidManifest.xml
deleted file mode 100644
index 5241aa4a..00000000
--- a/rro_overlays/NfcOverlay/AndroidManifest.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2023 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.
--->
-<!-- Pixel specific nfc overlays -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.nfc.overlay"
-    android:versionCode="1"
-    android:versionName="1.0">
-    <application android:hasCode="false" />
-    <overlay
-      android:targetPackage="com.android.nfc"
-      android:targetName="NfcCustomization"
-      android:isStatic="true"
-      android:priority="0"/>
-</manifest>
diff --git a/rro_overlays/NfcOverlay/OWNERS b/rro_overlays/NfcOverlay/OWNERS
deleted file mode 100644
index 35e9713f..00000000
--- a/rro_overlays/NfcOverlay/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-# Bug component: 48448
-include platform/packages/apps/Nfc:/OWNERS
diff --git a/self-extractors/Android.mk b/self-extractors/Android.mk
deleted file mode 100644
index e69de29b..00000000
--- a/self-extractors/Android.mk
+++ /dev/null
diff --git a/self-extractors/google_devices/staging/Android.mk b/self-extractors/google_devices/staging/Android.mk.template
index 5cb34af5..5cb34af5 100644
--- a/self-extractors/google_devices/staging/Android.mk
+++ b/self-extractors/google_devices/staging/Android.mk.template
diff --git a/self-extractors/qcom/staging/Android.mk b/self-extractors/qcom/staging/Android.mk.template
index 2c671794..2c671794 100644
--- a/self-extractors/qcom/staging/Android.mk
+++ b/self-extractors/qcom/staging/Android.mk.template
diff --git a/self-extractors_flame/Android.mk b/self-extractors_flame/Android.mk
deleted file mode 100644
index e69de29b..00000000
--- a/self-extractors_flame/Android.mk
+++ /dev/null
diff --git a/self-extractors_flame/google_devices/staging/Android.mk b/self-extractors_flame/google_devices/staging/Android.mk.template
index 81fb37da..81fb37da 100644
--- a/self-extractors_flame/google_devices/staging/Android.mk
+++ b/self-extractors_flame/google_devices/staging/Android.mk.template
diff --git a/self-extractors_flame/qcom/staging/Android.mk b/self-extractors_flame/qcom/staging/Android.mk.template
index 0104c4a2..0104c4a2 100644
--- a/self-extractors_flame/qcom/staging/Android.mk
+++ b/self-extractors_flame/qcom/staging/Android.mk.template