Make android.test.mock use api_srcs instead of jarjar
Since the jarjar solution was introduced, api_srcs support was added back to java_sdk_library. Migrate to that. Aside from the slightly simpler setup, I also noticed the jarjar-version left some *.uau and *.xml files in the output jar. Test: diff jar before and after Change-Id: I9724cce159ea4f1b882505f589a9cfe17a880514
This commit is contained in:
parent
0c4d524c33
commit
7a4b9d91f9
@ -27,9 +27,8 @@ package {
|
||||
|
||||
java_sdk_library {
|
||||
name: "android.test.mock",
|
||||
|
||||
srcs: [
|
||||
":android-test-mock-sources",
|
||||
srcs: [":android-test-mock-sources"],
|
||||
api_srcs: [
|
||||
// Note: Below are NOT APIs of this library. We only take APIs under
|
||||
// the android.test.mock package. They however provide private APIs that
|
||||
// android.test.mock APIs references to. We need to have the classes in
|
||||
@ -44,15 +43,9 @@ java_sdk_library {
|
||||
"app-compat-annotations",
|
||||
"unsupportedappusage",
|
||||
],
|
||||
|
||||
api_packages: [
|
||||
"android.test.mock",
|
||||
],
|
||||
// Only include android.test.mock.* classes. Jarjar rules below removes
|
||||
// classes in other packages like android.content. In order to keep the
|
||||
// list up-to-date, permitted_packages ensures that the library contains
|
||||
// clases under android.test.mock after the jarjar rules are applied.
|
||||
jarjar_rules: "jarjar-rules.txt",
|
||||
permitted_packages: [
|
||||
"android.test.mock",
|
||||
],
|
||||
|
@ -1,7 +0,0 @@
|
||||
zap android.accounts.**
|
||||
zap android.app.**
|
||||
zap android.content.**
|
||||
zap android.database.**
|
||||
zap android.os.**
|
||||
zap android.util.**
|
||||
zap android.view.**
|
Loading…
x
Reference in New Issue
Block a user