Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4811b33 authored by Roshan Pius's avatar Roshan Pius Committed by Automerger Merge Worker
Browse files

Merge "Revert "nfc(api): Dependencies to include in framework-nfc"" into main am: 1b18e3d1 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2798380



Change-Id: Id4785819f5c58f06f9d44fac4347301418722fa3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dc8efa9b 1b18e3d1

AconfigFlags.bp

+0 −4
Original line number Diff line number Diff line
@@ -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

+0 −34
Original line number Diff line number Diff line
@@ -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

0 → 100644
+43 −0
Original line number Diff line number Diff line 
//

// 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",

}