commit ae4332dc693cb7bd7a4c85b6553a23eca5ad67dd
author Anton Hansson <hansson@google.com> Thu Oct 08 13:11:47 2020 +0100
committer Anton Hansson <hansson@google.com> Fri Oct 09 14:45:24 2020 +0100
tree 758c5abe26d0b1eab2e23cc064b15f293b2aaaa5
parent b0ba7618c8584071d9a99ee6cf938ec474ff0f16

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

StubLibraries.bp

diff --git a/StubLibraries.bp b/StubLibraries.bp
index 50925a3..abe4fe9 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -139,11 +139,6 @@
             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 @@
             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 @@
             baseline_file: "api/module-lib-lint-baseline.txt",
         },
     },
-    dist: {
-        targets: ["sdk", "win_sdk"],
-        dir: "apistubs/android/module-lib/api",
-        dest: "android.txt",
-    },
 }
 
 droidstubs {

api/Android.bp

diff --git a/api/Android.bp b/api/Android.bp
index ffc4a21..fd0303b 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -60,6 +60,11 @@
     out: ["current.txt"],
     tools: ["metalava"],
     cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",
+    dist: {
+        targets: ["sdk", "win_sdk"],
+        dir: "apistubs/android/public/api",
+        dest: "android.txt",
+    },
 }
 
 genrule {
@@ -95,6 +100,11 @@
     out: ["system-current.txt"],
     tools: ["metalava"],
     cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",
+    dist: {
+        targets: ["sdk", "win_sdk"],
+        dir: "apistubs/android/system/api",
+        dest: "android.txt",
+    },
 }
 
 genrule {
@@ -129,6 +139,11 @@
     out: ["module-lib-current.txt"],
     tools: ["metalava"],
     cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",
+    dist: {
+        targets: ["sdk", "win_sdk"],
+        dir: "apistubs/android/module-lib/api",
+        dest: "android.txt",
+    },
 }
 
 genrule {