Commit Graph

8 Commits

Author SHA1 Message Date
Anton Hansson
ae4332dc69 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
2020-10-09 14:45:24 +01:00
Anton Hansson
a15427af11 Add genrule for combined-removed-dex
This is a module that aims to have the same contents as
out/soong/hiddenapi/combined-dex-api generated by hiddenapi_singleton.go
inside soong, but generated using a different method that does not
depend on the monolithic droidstubs rule in frameworks/base.

This is part of a series of changes to remove all the dependencies on
the monolithic droidstub rules, so that they can eventually be removed.

Bug: 169034951
Bug: 169395887
Test: m combined-dex-api
Change-Id: I2c4a76aa1d85ef44fc467474afacec20901aee13
2020-10-06 12:58:51 +00:00
Anton Hansson
3c1aa119fc Re-submit "Add genrules for merged removed.txt files"
No diffs vs monoliths. The TARGET_BUILD_APPS issue has been fixed.

Bug: 169034951
Test: for p in "" "system-" "module-lib-"; do
  for t in "current" "removed"; do
      echo "${p}${t}:"
      echo "$(diff -u0 \
          <($CANON frameworks/base/api/${p}${t}.txt | sort) \
          <($CANON out/soong/.intermediates/frameworks/base/api/frameworks-base-api-${p}${t}-merged.txt/gen/${p}${t}.txt | sort))"
  done
done
(cherry picked from commit cfb26e3b4c)

Change-Id: I1f637b69d96c0b86f4f30da6b68f06a382e50d28
2020-10-02 17:48:07 +01:00
Anton Hansson
ca5b8b5c6f Revert "Add genrules for merged removed.txt files"
This reverts commit cfb26e3b4c.

Reason for revert: b/169747069

Change-Id: I9290708aea6a66bbecc098b75403f6e5d7e77ec7
2020-09-30 13:50:48 +00:00
Anton Hansson
cfb26e3b4c Add genrules for merged removed.txt files
No diffs vs monoliths.

Bug: 169034951
Test: for p in "" "system-" "module-lib-"; do
  for t in "current" "removed"; do
      echo "${p}${t}:"
      echo "$(diff -u0 \
          <($CANON frameworks/base/api/${p}${t}.txt | sort) \
          <($CANON out/soong/.intermediates/frameworks/base/api/frameworks-base-api-${p}${t}-merged.txt/gen/${p}${t}.txt | sort))"
  done
done

Change-Id: Id97b88b7d8e4c0b0e372e30658c48436427dbe7c
2020-09-25 09:13:47 +01:00
Anton Hansson
85359f6f0b Add genrules for merged current.txt
Feed metalava all module txt files and write a single file. These are
intended to replace the checked in monolithic current.txt eventually.
Note that they are unused for now, they're getting checked in to enable
easier collaboration.

Bug: 169034951
Test: m frameworks-base-api-{,system-,module-lib-}current-merged.txt
Test: Manual inspection for now, some very minor diffs
Change-Id: I1e1d0aff8475d3aaa354308bb70d54201488de61
2020-09-22 18:53:15 +01:00
Anton Hansson
fcb91d4ad0 Move api/*current.txt filegroups into api dir
The StubLibraries bp file is sufficiently humongous without them.

Bug: 169034951
Test: presubmit
Change-Id: I2809f94f950cdebb6c1fbf8de091e9d9443810d6
2020-09-21 17:03:14 +01:00
Sasha Smundak
02cbff4425 Android.bp file to convert current.api to XML format.
Fixes: 139281092
Test: atest CtsDevicePolicyManagerTestCases
Change-Id: Iffec912af4ee9dd3de2090a31bd475abc5016854
2019-08-15 09:43:47 -07:00