diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-22 21:33:10 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-22 21:33:10 +0000 |
commit | 2ebd7e795e4117bfc774cc63f3274d2dc3c8f2ef (patch) | |
tree | a8248e98ac72e39969fe4f463f4a8cd5046cc9a7 | |
parent | f1366c0a5dba58b63d1cd7cb1db051f1b2b9b9f0 (diff) | |
parent | a9544cd2ed2100127cf0f3b7c0e1127ec07bf715 (diff) | |
download | redfin-2ebd7e795e4117bfc774cc63f3274d2dc3c8f2ef.tar.gz |
Snap for 11135399 from a9544cd2ed2100127cf0f3b7c0e1127ec07bf715 to simpleperf-release
Change-Id: I1f3a023eafc07950dcad2fcd013964bfade5820a
-rw-r--r-- | AndroidProducts.mk | 4 | ||||
-rw-r--r-- | device-redfin.mk | 3 | ||||
-rw-r--r-- | redfin/overlay/packages/apps/Nfc/res/values/config.xml (renamed from redfin/rro_overlays/NfcOverlay/res/values/config.xml) | 0 | ||||
-rw-r--r-- | redfin/rro_overlays/NfcOverlay/Android.bp | 9 | ||||
-rw-r--r-- | redfin/rro_overlays/NfcOverlay/AndroidManifest.xml | 27 | ||||
-rw-r--r-- | redfin/rro_overlays/NfcOverlay/OWNERS | 2 | ||||
-rw-r--r-- | self-extractors/Android.mk | 0 | ||||
-rw-r--r-- | self-extractors/google_devices/staging/Android.mk.template (renamed from self-extractors/google_devices/staging/Android.mk) | 0 | ||||
-rw-r--r-- | self-extractors/qcom/staging/Android.mk.template (renamed from self-extractors/qcom/staging/Android.mk) | 0 |
9 files changed, 2 insertions, 43 deletions
diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 1dc1835..bea4981 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -22,5 +22,5 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/aosp_redfin_hwasan.mk \ COMMON_LUNCH_CHOICES := \ - aosp_redfin-userdebug \ - aosp_redfin_vf-userdebug \ + aosp_redfin-trunk_staging-userdebug \ + aosp_redfin_vf-trunk_staging-userdebug \ diff --git a/device-redfin.mk b/device-redfin.mk index ae4645e..6bd769c 100644 --- a/device-redfin.mk +++ b/device-redfin.mk @@ -247,6 +247,3 @@ endif # Workaround for prebuilt Qualcomm neural network HAL PRODUCT_PACKAGES += \ libprotobuf-cpp-full-3.9.1-vendorcompat - -PRODUCT_PACKAGES += \ - NfcOverlayRedfin diff --git a/redfin/rro_overlays/NfcOverlay/res/values/config.xml b/redfin/overlay/packages/apps/Nfc/res/values/config.xml index 3d2adaa..3d2adaa 100644 --- a/redfin/rro_overlays/NfcOverlay/res/values/config.xml +++ b/redfin/overlay/packages/apps/Nfc/res/values/config.xml diff --git a/redfin/rro_overlays/NfcOverlay/Android.bp b/redfin/rro_overlays/NfcOverlay/Android.bp deleted file mode 100644 index c08c3e3..0000000 --- a/redfin/rro_overlays/NfcOverlay/Android.bp +++ /dev/null @@ -1,9 +0,0 @@ -package { - default_applicable_licenses: ["device_google_redfin_license"], -} - -runtime_resource_overlay { - name: "NfcOverlayRedfin", - sdk_version: "current", - product_specific: true -} diff --git a/redfin/rro_overlays/NfcOverlay/AndroidManifest.xml b/redfin/rro_overlays/NfcOverlay/AndroidManifest.xml deleted file mode 100644 index 5241aa4..0000000 --- a/redfin/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/redfin/rro_overlays/NfcOverlay/OWNERS b/redfin/rro_overlays/NfcOverlay/OWNERS deleted file mode 100644 index 35e9713..0000000 --- a/redfin/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 e69de29..0000000 --- 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 a6db277..a6db277 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 d87db8e..d87db8e 100644 --- a/self-extractors/qcom/staging/Android.mk +++ b/self-extractors/qcom/staging/Android.mk.template |