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

Commit 9b201ee8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Move keystore.proto into android/app" into main am: da0f394b 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2691053



Change-Id: I9c26812cd860dfe01bb0e8fb25b5fd1e0261842d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a42ca71f da0f394b

android/app/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -199,8 +199,12 @@ android_app { 
    srcs: [

        ":statslog-bluetooth-java-gen",

        ":statslog-bt-restricted-java-gen",

        "proto/keystore.proto",

        "src/**/*.java",

    ],

    proto: {

        type: "lite",

    },

    aaptflags: [

        "--custom-package",

        "com.android.bluetooth",

system/gd/proto/bluetooth/bluetoothKeystore/keystore.proto→android/app/proto/keystore.proto

+0 −3
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ 


syntax = "proto2";



// C++ namespace: bluetooth::metrics::BluetoothMetricsProto

package bluetooth.keystore.BluetoothKeystoreProto;



option java_package = "com.android.bluetooth";

option java_outer_classname = "BluetoothKeystoreProto";

system/gd/proto/Android.bp

+0 −3
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ java_library_static { 
        type: "lite",

    },

    srcs: [

        "bluetooth/bluetoothKeystore/keystore.proto",

        "bluetooth/metrics/bluetooth.proto",

    ],

    apex_available: [
@@ -32,7 +31,6 @@ cc_library_static { 
        type: "lite",

    },

    srcs: [

        "bluetooth/bluetoothKeystore/keystore.proto",

        "bluetooth/metrics/bluetooth.proto",

    ],

    apex_available: [
@@ -50,7 +48,6 @@ cc_library_static { 
        include_dirs: ["external/protobuf/src"],

    },

    srcs: [

        "bluetooth/bluetoothKeystore/keystore.proto",

        "bluetooth/metrics/bluetooth.proto",

    ],

    apex_available: [