Removed stats/atoms/gps/Android.bp am: 77d8c9ad3c
Original change: https://android-review.googlesource.com/c/platform/frameworks/proto_logging/+/2323835
Change-Id: I574243d707584e188ecf999c2b99932e199320ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/stats/Android.bp b/stats/Android.bp
index 8e11cd8..63f3d60 100644
--- a/stats/Android.bp
+++ b/stats/Android.bp
@@ -76,6 +76,10 @@
":text_classifier_proto",
]
+atom_protos = [
+ "atoms/gps/*.proto",
+]
+
cc_library_host_shared {
name: "libstats_proto_host",
srcs: [
@@ -98,8 +102,7 @@
srcs: [
"atoms.proto",
"attribution_node.proto",
- ":libstats_gps_atom_protos",
- ],
+ ] + atom_protos,
}
filegroup {
diff --git a/stats/atoms/gps/Android.bp b/stats/atoms/gps/Android.bp
deleted file mode 100644
index a3e6673..0000000
--- a/stats/atoms/gps/Android.bp
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (C) 2022 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: "libstats_gps_atom_protos",
- srcs: [
- "gps_atoms.proto",
- ],
-}
