Revert "nfc(api): Dependencies to include in framework-nfc"

This reverts commit 869155b8.

Reason for revert: Causes build failure

Bug: 306523602
Change-Id: Ib3fffa498d1e645fc1b38eb61084564534fef72e
Test: N/A

AconfigFlags.bp

@@ -123,10 +123,6 @@ aconfig_declarations {
 java_aconfig_library {
     name: "android.nfc.flags-aconfig-java",
     aconfig_declarations: "android.nfc.flags-aconfig",
-    min_sdk_version: "VanillaIceCream",
-    apex_available: [
-        "com.android.nfcservices",
-    ],
     defaults: ["framework-minus-apex-aconfig-java-defaults"],
 }
 

ProtoLibraries.bp

@@ -77,40 +77,6 @@ gensrcs {
     output_extension: "proto.h",
 }
 
-// ====  nfc framework java library  ==============================
-gensrcs {
-    name: "framework-nfc-javastream-protos",
-
-    tools: [
-        "aprotoc",
-        "protoc-gen-javastream",
-        "soong_zip",
-    ],
-
-    cmd: "mkdir -p $(genDir)/$(in) " +
-        "&& $(location aprotoc) " +
-        "  --plugin=$(location protoc-gen-javastream) " +
-        "  --javastream_out=$(genDir)/$(in) " +
-        "  -Iexternal/protobuf/src " +
-        "  -I . " +
-        "  $(in) " +
-        "&& $(location soong_zip) -jar -o $(out) -C $(genDir)/$(in) -D $(genDir)/$(in)",
-
-    srcs: [
-        "core/proto/android/app/pendingintent.proto",
-        "core/proto/android/content/component_name.proto",
-        "core/proto/android/content/intent.proto",
-        "core/proto/android/nfc/*.proto",
-        "core/proto/android/os/patternmatcher.proto",
-    ],
-
-    data: [
-        ":libprotobuf-internal-protos",
-    ],
-
-    output_extension: "srcjar",
-}
-
 // ====  java proto host library  ==============================
 java_library_host {
     name: "platformprotos",

core/proto/android/nfc/Android.bp

+//
+// 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.
+//
+
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+filegroup {
+    name: "srcs_nfc_proto",
+    srcs: [
+        "*.proto",
+    ],
+}
+
+// Will be statically linked by `framework-nfc`.
+java_library {
+    name: "nfc-proto-java-gen",
+    installable: false,
+    proto: {
+        type: "stream",
+        include_dirs: [
+            "external/protobuf/src",
+        ],
+    },
+    srcs: [
+        ":srcs_nfc_proto",
+    ],
+    sdk_version: "current",
+    min_sdk_version: "current",
+}