diff options
| -rw-r--r-- | AconfigFlags.bp | 5 | ||||
| -rw-r--r-- | ProtoLibraries.bp | 36 | ||||
| -rw-r--r-- | core/proto/android/nfc/Android.bp | 43 |
3 files changed, 41 insertions, 43 deletions
diff --git a/AconfigFlags.bp b/AconfigFlags.bp index f0e0c30fd031..2683f1beab7c 100644 --- a/AconfigFlags.bp +++ b/AconfigFlags.bp @@ -123,6 +123,11 @@ aconfig_declarations { java_aconfig_library { name: "android.nfc.flags-aconfig-java", aconfig_declarations: "android.nfc.flags-aconfig", + min_sdk_version: "VanillaIceCream", + apex_available: [ + "//apex_available:platform", + "com.android.nfcservices", + ], defaults: ["framework-minus-apex-aconfig-java-defaults"], } diff --git a/ProtoLibraries.bp b/ProtoLibraries.bp index 45bb16184069..e7adf203334e 100644 --- a/ProtoLibraries.bp +++ b/ProtoLibraries.bp @@ -77,6 +77,42 @@ 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", + "core/proto/android/os/persistablebundle.proto", + "core/proto/android/privacy.proto", + ], + + data: [ + ":libprotobuf-internal-protos", + ], + + output_extension: "srcjar", +} + // ==== java proto host library ============================== java_library_host { name: "platformprotos", diff --git a/core/proto/android/nfc/Android.bp b/core/proto/android/nfc/Android.bp deleted file mode 100644 index 6a62c917f240..000000000000 --- a/core/proto/android/nfc/Android.bp +++ /dev/null @@ -1,43 +0,0 @@ -// -// 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", -} |