commit 57c1fa5d11cba0654abd94ea10cc1ac48b26762c
author Roshan Pius <rpius@google.com> Tue Dec 05 05:42:12 2023 +0000
committer Android Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Tue Dec 05 05:42:12 2023 +0000
tree aa8d131e1a753df3c40967b5e085f66a9450e469
parent 5d034ba5c0f984086d85b50cabbd76302e01e363

Revert "Revert "handheld_system: Use build flag for NFC stack in..."

Revert submission 25548952-revert-25531363-nfc_apex_reland_flags-TJRICWNQNN

Reason for revert: Reland with build failure fix.

Reverted changes: /q/submissionid:25548952-revert-25531363-nfc_apex_reland_flags-TJRICWNQNN

Bug: 303286040
Test: Compiles
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:76cf501a8ae2965d61937c2a8aab99698cb41c20)
Merged-In: Ic8fdadeaf49eafb2119a94e6dd61b808c60fad96
Change-Id: Ic8fdadeaf49eafb2119a94e6dd61b808c60fad96

target/product/handheld_system.mk

diff --git a/target/product/handheld_system.mk b/target/product/handheld_system.mk
index 6c93dd7..219b90c 100644
--- a/target/product/handheld_system.mk
+++ b/target/product/handheld_system.mk
@@ -56,7 +56,6 @@
     MmsService \
     MtpService \
     MusicFX \
-    NfcNci \
     PacProcessor \
     preinstalled-packages-platform-handheld-system.xml \
     PrintRecommendationService \
@@ -73,6 +72,7 @@
     UserDictionaryProvider \
     VpnDialogs \
     vr \
+    $(RELEASE_PACKAGE_NFC_STACK)
 
 
 PRODUCT_SYSTEM_SERVER_APPS += \