Snap for 11135399 from bd9ce8035d962b2b272ce479176b89d087d2e908 to simpleperf-release

Change-Id: I013f866fff28b7c56746dd53f44e75494e5b3ef0

18 files changed, 10 insertions, 97 deletions

diff --git a/Android.mk b/Android.mk
index b06dd96f..c0e61da0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,8 +20,6 @@
 # to only building on ARM if they include assembly. Individual makefiles
 # are responsible for having their own logic, for fine-grained control.
 
-LOCAL_PATH := $(call my-dir)
-
 $(eval $(call declare-copy-files-license-metadata,device/google/raviole,default-permissions.xml,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
 $(eval $(call declare-copy-files-license-metadata,device/google/raviole,libnfc-nci-raven.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
 $(eval $(call declare-copy-files-license-metadata,device/google/raviole,libnfc-nci.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
@@ -38,10 +36,3 @@ $(eval $(call declare-copy-files-license-metadata,device/google/raviole,wpa_supp
 $(eval $(call declare-copy-files-license-metadata,device/google/raviole,wpa_supplicant_overlay.conf,SPDX-license-identifier-Apache-2.0,notice,build/soong/licenses/LICENSE,))
 
 $(eval $(call declare-1p-copy-files,device/google/raviole,audio_policy_configuration.xml))
-
-# if some modules are built directly from this directory (not subdirectories),
-# their rules should be written here.
-
-ifeq ($(USES_DEVICE_GOOGLE_RAVIOLE),true)
-  include $(call first-makefiles-under,$(LOCAL_PATH))
-endif
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index c2c8efea..ce06e547 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -39,7 +39,7 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/factory_whitefin.mk
 
 COMMON_LUNCH_CHOICES := \
-    aosp_slider-userdebug \
-    aosp_whitefin-userdebug \
-    aosp_oriole-userdebug \
-    aosp_raven-userdebug
+    aosp_slider-trunk_staging-userdebug \
+    aosp_whitefin-trunk_staging-userdebug \
+    aosp_oriole-trunk_staging-userdebug \
+    aosp_raven-trunk_staging-userdebug
diff --git a/device-oriole.mk b/device-oriole.mk
index ebca2499..21847151 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -133,10 +133,9 @@ PRODUCT_COPY_FILES += \
 	device/google/raviole/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
 
 PRODUCT_PACKAGES += \
-	com.android.nfcservices \
+	NfcNci \
 	Tag \
-	android.hardware.nfc-service.st \
-	NfcOverlayOriole
+	android.hardware.nfc-service.st
 
 # SecureElement
 PRODUCT_PACKAGES += \
diff --git a/device-raven.mk b/device-raven.mk
index c5830f93..8ebde0c3 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -148,10 +148,9 @@ PRODUCT_COPY_FILES += \
 endif
 
 PRODUCT_PACKAGES += \
-	com.android.nfcservices \
+	NfcNci \
 	Tag \
-	android.hardware.nfc-service.st \
-	NfcOverlayRaven
+	android.hardware.nfc-service.st
 
 # SecureElement
 PRODUCT_PACKAGES += \
diff --git a/device-slider.mk b/device-slider.mk
index 5f2a741d..5cbab35d 100644
--- a/device-slider.mk
+++ b/device-slider.mk
@@ -83,7 +83,7 @@ PRODUCT_COPY_FILES += \
 	device/google/raviole/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
 
 PRODUCT_PACKAGES += \
-	com.android.nfcservices \
+	NfcNci \
 	Tag \
 	android.hardware.nfc-service.st
 
diff --git a/device-whitefin.mk b/device-whitefin.mk
index 090b93eb..0c366c81 100644
--- a/device-whitefin.mk
+++ b/device-whitefin.mk
@@ -79,7 +79,7 @@ PRODUCT_COPY_FILES += \
 	device/google/raviole/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
 
 PRODUCT_PACKAGES += \
-	com.android.nfcservices \
+	NfcNci \
 	Tag \
 	android.hardware.nfc-service.st
 
diff --git a/oriole/rro_overlays/NfcOverlay/res/values/config.xml b/oriole/overlay/packages/apps/Nfc/res/values/config.xml
index d1f5832c..d1f5832c 100644
--- a/oriole/rro_overlays/NfcOverlay/res/values/config.xml
+++ b/oriole/overlay/packages/apps/Nfc/res/values/config.xml
diff --git a/oriole/rro_overlays/NfcOverlay/Android.bp b/oriole/rro_overlays/NfcOverlay/Android.bp
deleted file mode 100644
index 80de8916..00000000
--- a/oriole/rro_overlays/NfcOverlay/Android.bp
+++ /dev/null
@@ -1,9 +0,0 @@
-package {
-    default_applicable_licenses: ["device_google_raviole_license"],
-}
-
-runtime_resource_overlay {
-    name: "NfcOverlayOriole",
-    sdk_version: "current",
-    product_specific: true
-}
diff --git a/oriole/rro_overlays/NfcOverlay/AndroidManifest.xml b/oriole/rro_overlays/NfcOverlay/AndroidManifest.xml
deleted file mode 100644
index 5241aa4a..00000000
--- a/oriole/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/oriole/rro_overlays/NfcOverlay/OWNERS b/oriole/rro_overlays/NfcOverlay/OWNERS
deleted file mode 100644
index 35e9713f..00000000
--- a/oriole/rro_overlays/NfcOverlay/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-# Bug component: 48448
-include platform/packages/apps/Nfc:/OWNERS
diff --git a/raven/rro_overlays/NfcOverlay/res/values/config.xml b/raven/overlay/packages/apps/Nfc/res/values/config.xml
index e17a0a22..e17a0a22 100644
--- a/raven/rro_overlays/NfcOverlay/res/values/config.xml
+++ b/raven/overlay/packages/apps/Nfc/res/values/config.xml
diff --git a/raven/rro_overlays/NfcOverlay/Android.bp b/raven/rro_overlays/NfcOverlay/Android.bp
deleted file mode 100644
index 85b298c3..00000000
--- a/raven/rro_overlays/NfcOverlay/Android.bp
+++ /dev/null
@@ -1,9 +0,0 @@
-package {
-    default_applicable_licenses: ["device_google_raviole_license"],
-}
-
-runtime_resource_overlay {
-    name: "NfcOverlayRaven",
-    sdk_version: "current",
-    product_specific: true
-}
diff --git a/raven/rro_overlays/NfcOverlay/AndroidManifest.xml b/raven/rro_overlays/NfcOverlay/AndroidManifest.xml
deleted file mode 100644
index 5241aa4a..00000000
--- a/raven/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/raven/rro_overlays/NfcOverlay/OWNERS b/raven/rro_overlays/NfcOverlay/OWNERS
deleted file mode 100644
index 35e9713f..00000000
--- a/raven/rro_overlays/NfcOverlay/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-# Bug component: 48448
-include platform/packages/apps/Nfc:/OWNERS
diff --git a/self-extractors_oriole/Android.mk b/self-extractors_oriole/Android.mk
deleted file mode 100644
index e69de29b..00000000
--- a/self-extractors_oriole/Android.mk
+++ /dev/null
diff --git a/self-extractors_oriole/google_devices/staging/Android.mk b/self-extractors_oriole/google_devices/staging/Android.mk.template
index 835f6e81..835f6e81 100644
--- a/self-extractors_oriole/google_devices/staging/Android.mk
+++ b/self-extractors_oriole/google_devices/staging/Android.mk.template
diff --git a/self-extractors_raven/Android.mk b/self-extractors_raven/Android.mk
deleted file mode 100644
index e69de29b..00000000
--- a/self-extractors_raven/Android.mk
+++ /dev/null
diff --git a/self-extractors_raven/google_devices/staging/Android.mk b/self-extractors_raven/google_devices/staging/Android.mk.template
index d4e1289d..d4e1289d 100644
--- a/self-extractors_raven/google_devices/staging/Android.mk
+++ b/self-extractors_raven/google_devices/staging/Android.mk.template