diff options
| author | Anton Hansson <hansson@google.com> | 2020-10-08 13:11:47 +0100 |
|---|---|---|
| committer | Anton Hansson <hansson@google.com> | 2020-10-09 14:45:24 +0100 |
| commit | ae4332dc693cb7bd7a4c85b6553a23eca5ad67dd (patch) | |
| tree | 758c5abe26d0b1eab2e23cc064b15f293b2aaaa5 /StubLibraries.bp | |
| parent | b0ba7618c8584071d9a99ee6cf938ec474ff0f16 (diff) | |
Move the dist rules from monolithic to merged rules
These API tracking files are identical except for 2 inlined permission
constants in the public API, which do not matter.
```
@@ -31606 +31606 @@
- method @Deprecated @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", "android.permission.NETWORK_SETUP_WIZARD"}) public java.util.List<android.net.wifi.hotspot2.PasspointConfiguration> getPasspointConfigurations();
+ method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.List<android.net.wifi.hotspot2.PasspointConfiguration> getPasspointConfigurations();
@@ -31634 +31634 @@
- method @Deprecated @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", "android.permission.NETWORK_CARRIER_PROVISIONING"}) public void removePasspointConfiguration(String);
+ method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_CARRIER_PROVISIONING}) public void removePasspointConfiguration(String);
```
Bug: 158465496
Test: lunch sdk_phone_armv7 ; m sdk dist ; diff artifacts
Change-Id: Ibde9310bb1f5c0921962c022e158a861b233f6d1
Diffstat (limited to 'StubLibraries.bp')
| -rw-r--r-- | StubLibraries.bp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/StubLibraries.bp b/StubLibraries.bp index 50925a37d12b..abe4fe919165 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -139,11 +139,6 @@ droidstubs { baseline_file: "api/lint-baseline.txt", }, }, - dist: { - targets: ["sdk", "win_sdk"], - dir: "apistubs/android/public/api", - dest: "android.txt", - }, jdiff_enabled: true, } @@ -206,11 +201,6 @@ droidstubs { baseline_file: "api/system-lint-baseline.txt", }, }, - dist: { - targets: ["sdk", "win_sdk"], - dir: "apistubs/android/system/api", - dest: "android.txt", - }, jdiff_enabled: true, } @@ -291,11 +281,6 @@ droidstubs { baseline_file: "api/module-lib-lint-baseline.txt", }, }, - dist: { - targets: ["sdk", "win_sdk"], - dir: "apistubs/android/module-lib/api", - dest: "android.txt", - }, } droidstubs { |