From 442fcf48c42a6652f12a454e84e384256e808725 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Fri, 27 Mar 2020 15:09:26 +0000
Subject: [PATCH] Add package filter for system_server stubs

Should prevent accidental addition of APIs outside com.android,
which is where we want these APIs to be.

Also fix a bug in the permission filegroup where it wasn't
specifying the subpath of its code.

Bug: 149293194
Test: m update-api
Change-Id: I144ce6dbfe524106fc7de87318f66390c31b45af
---
 apex/Android.bp                    | 1 +
 apex/permission/service/Android.bp | 1 +
 services/Android.bp                | 1 +
 3 files changed, 3 insertions(+)

diff --git a/apex/Android.bp b/apex/Android.bp
index e8f6e6bf2c463..adf418557e197 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -137,6 +137,7 @@ stubs_defaults {
     name: "service-module-stubs-srcs-defaults",
     args: mainline_service_stubs_args,
     installable: false,
+    filter_packages: ["com.android."],
     check_api: {
         current: {
             api_file: "api/current.txt",
diff --git a/apex/permission/service/Android.bp b/apex/permission/service/Android.bp
index 679c98ddcbb53..5cdcdd335a121 100644
--- a/apex/permission/service/Android.bp
+++ b/apex/permission/service/Android.bp
@@ -17,6 +17,7 @@ filegroup {
     srcs: [
         "java/**/*.java",
     ],
+    path: "java",
 }
 
 java_library {
diff --git a/services/Android.bp b/services/Android.bp
index 52c5993a28626..1ce7dcfff03b2 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -126,6 +126,7 @@ droidstubs {
         " --hide DeprecationMismatch" +
         " --hide HiddenTypedefConstant",
     visibility: ["//visibility:private"],
+    filter_packages: ["com.android."],
     check_api: {
         current: {
             api_file: "api/current.txt",