summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRamy Medhat <abdelaal@google.com>2020-06-21 01:48:34 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-21 01:48:34 +0000
commit6282833dad7a83845679305cb09f6565ef164425 (patch)
tree30544f16d2c11aa21c946cfa02e3f1cc661c5ee6
parent6b2d93cf8aeb1633c0c9d5acaf4b9bbed16f1aa7 (diff)
parente487a021669d1dcde97192b3a0d444d870ee3cc9 (diff)
Merge "Revert "Enable metalava sandbox in StubLibraries.bp and ApiDocs.bp."" am: 98acc8b4ab am: e487a02166
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1345260 Change-Id: If587bdab312770b4d00a9a83ab477c5f5320a1d8
-rw-r--r--ApiDocs.bp1
-rw-r--r--StubLibraries.bp2
2 files changed, 0 insertions, 3 deletions
diff --git a/ApiDocs.bp b/ApiDocs.bp
index 2d12e2d321e6..029699efe3b9 100644
--- a/ApiDocs.bp
+++ b/ApiDocs.bp
@@ -91,7 +91,6 @@ droidstubs {
arg_files: [
"core/res/AndroidManifest.xml",
],
- sandbox: true,
args: metalava_framework_docs_args,
write_sdk_values: true,
}
diff --git a/StubLibraries.bp b/StubLibraries.bp
index 45cd76b1cf75..9f5b183913c0 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -64,7 +64,6 @@ stubs_defaults {
],
api_levels_annotations_enabled: false,
filter_packages: packages_to_document,
- sandbox: true,
}
stubs_defaults {
@@ -439,7 +438,6 @@ droidstubs {
"core/java/android/os/RemoteException.java",
"core/java/android/util/AndroidException.java",
],
- sandbox: true,
installable: false,
sdk_version: "core_platform",
annotations_enabled: true,