Commit Graph

31 Commits

Author SHA1 Message Date
Paul Duffin
24c79cdb88 Merge "Unbundle i18n API from android-non-updatable" am: 17e6d5b6a3 am: 3322b2800a am: f358ccece0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513291

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I576e27b966d5e7b731a3f944bdee353e2cac9106
2020-12-11 10:50:29 +00:00
Paul Duffin
5a4e8f234d Unbundle i18n API from android-non-updatable
This removes the i18n source from the non-updatable stubs which removes
them from the frameworks/base/core/api files too. The API is still
protected by both the build and Gerrit review as the API is specified
in the external/icu/android_icu4j/api/public/ directory.

The i18n stubs source is used instead of the implementation source for
generating the JavaDoc. That revealed a minor issue with metalava which
is fixed in this topic.

The i18n stubs library was statically included alongside the conscrypt
stubs library so it will still appear in the monolothic android.jar.

Bug: 174344410
Test: m offline-sdk-docs
      - check that i18n classes are present
      m android_stubs_current android_system_stubs_current android_test_stubs_current
      - check that i18n classes are present in each jar
      m droid
Change-Id: I744c8bac54a8a5518ca0eca2a7700abbfa0997f4
2020-12-10 11:23:19 +00:00
Anton Hansson
d75144f25c Re-submit "Add genrule for combined srcjar of modules"
The sources of the stubs are shipped as part of the public SDK.
Currently the SDK depends on the output of the monolithic metalava run,
but it can be assembled by merging the srcjars of the individual runs.

There is a diff -- module stub sources contain javadoc comments. I don't
think has any negative impact. Also package-info.html files are
included, which probably is fine.

Bug: 169034951
Test: diff new output with existing monolith
Test: TARGET_BUILD_APPS=foo m nothing
Change-Id: I851ff8e87476b8e22abdcfe1d75da5d82030f302
Merged-In: I851ff8e87476b8e22abdcfe1d75da5d82030f302
(cherry picked from commit 89c74dc41c)
2020-11-10 07:53:14 +00:00
Anton Hansson
89c74dc41c Re-submit "Add genrule for combined srcjar of modules"
The sources of the stubs are shipped as part of the public SDK.
Currently the SDK depends on the output of the monolithic metalava run,
but it can be assembled by merging the srcjars of the individual runs.

There is a diff -- module stub sources contain javadoc comments. I don't
think has any negative impact. Also package-info.html files are
included, which probably is fine.

Bug: 169034951
Test: diff new output with existing monolith
Test: TARGET_BUILD_APPS=foo m nothing
Change-Id: I851ff8e87476b8e22abdcfe1d75da5d82030f302
2020-11-10 07:50:10 +00:00
Colin Cross
4d506d7420 Merge "Revert "Add genrule for combined srcjar of modules"" 2020-11-06 19:28:34 +00:00
Colin Cross
9018bfbf0f Revert "Add genrule for combined srcjar of modules"
This reverts commit ddf171aaf8.

Reason for revert: b/172663078

Bug: 169034951
Bug: 172663078
Change-Id: Ibd1269d72f15b43817ffec50eb94f72671e7538b
Merged-In: Ifb5f56bf5468969ad026f10186763ef604113adc
2020-11-06 19:26:56 +00:00
Colin Cross
15eeedb506 Revert "Add genrule for combined srcjar of modules"
This reverts commit 5d0687a2ef.

Reason for revert: b/172663078

Bug: 169034951
Bug: 172663078
Change-Id: Ifb5f56bf5468969ad026f10186763ef604113adc
2020-11-06 18:31:30 +00:00
Anton Hansson
1452dc60ca Merge "Add genrule for combined srcjar of modules" 2020-11-06 14:55:18 +00:00
Anton Hansson
ddf171aaf8 Add genrule for combined srcjar of modules
The sources of the stubs are shipped as part of the public SDK.
Currently the SDK depends on the output of the monolithic metalava run,
but it can be assembled by merging the srcjars of the individual runs.

There is a diff -- module stub sources contain javadoc comments. I don't
think has any negative impact. Also package-info.html files are
included, which probably is fine.

Bug: 169034951
Test: diff new output with existing monolith
Change-Id: Idfc94cdb3317d3bde0b29fd8da0a9ccef47377f9
Merged-In: Idfc94cdb3317d3bde0b29fd8da0a9ccef47377f9
(cherry picked from commit 5d0687a2ef)
2020-11-05 20:26:56 +00:00
Anton Hansson
5d0687a2ef Add genrule for combined srcjar of modules
The sources of the stubs are shipped as part of the public SDK.
Currently the SDK depends on the output of the monolithic metalava run,
but it can be assembled by merging the srcjars of the individual runs.

There is a diff -- module stub sources contain javadoc comments. I don't
think has any negative impact. Also package-info.html files are
included, which probably is fine.

Bug: 169034951
Test: diff new output with existing monolith
Change-Id: Idfc94cdb3317d3bde0b29fd8da0a9ccef47377f9
2020-11-05 20:25:34 +00:00
Anton Hansson
04774ea1ba Merge "Make current-api-xml use generated current.txt" am: 3ab2ebfe26 am: 18503252ef am: 81a0d7c236 am: c43bbaa053
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1488696

Change-Id: Ic88b75609f8c18d0222e9faa3b21b72e61fc4e72
2020-11-05 15:49:03 +00:00
Anton Hansson
00febe2eb6 Make current-api-xml use generated current.txt
Remove the dep on the monolithic current.txt so that it can be deleted.

Bug: 158465496
Test: m current-api-xml (same before and after)
Change-Id: I6d36801592a20cb9dc8f87c7d9d4babf0986c448
2020-11-05 10:30:59 +00:00
Anton Hansson
4a48531a62 Merge "Remove filegroups for *current.txt files" am: 2a8f6d0027 am: f9a5e2a76e am: 059abfa49c am: 3611a8d3a1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1484121

Change-Id: I7aeba7aa3f882a5b274d5e8969119640f98509b3
2020-11-03 10:59:41 +00:00
Anton Hansson
1c4fab45a3 Remove filegroups for *current.txt files
Export the merged txt files instead.

Bug: 158465496
Test: diff current.txt / current-merged.txt
Change-Id: I028c6ef4067f40e98dc20d4892a8b87a02521e9c
2020-11-02 12:59:35 +00:00
Anton Hansson
867119b5f1 Merge "Dist the merged api txts for normal builds too" am: 208cdcbf3f am: a1e66b4d43 am: 4b0e3f92ae am: d9d3a6ce10
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1468242

Change-Id: I5c25656990432c01628ccdabd44a10da8bdf114f
2020-10-21 11:10:02 +00:00
Anton Hansson
a9ced809ad Dist the merged api txts for normal builds too
Makes the merged txts available on the build server for most
continuous builds.

Bug: 169034951
Bug: 170802619
Test: m dist && diff frameworks/base/api and out/dist/api
Change-Id: I57daa8e42c3931070f19cde9a74d2b11d03d2d6d
2020-10-20 19:26:18 +01:00
Anton Hansson
34529139fd Merge "Move the dist rules from monolithic to merged rules" am: 99398da506 am: 3b8ec2dcac am: 88901af27b am: b5fcebde9d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1454979

Change-Id: Id64f6017e54e27d97c822e62a85e0221a2454bfa
2020-10-12 12:27:13 +00:00
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
d74139eea7 Add appsearch and graphics to module lists
These two were missing from some of the lists of all modules,
as they either weren't standardized or not available in the branch
where the list was first added.

Bug: 169034951
Test: m
Change-Id: I16c67ef8a433e6720953a2046c09add13a8102ed
2020-10-08 15:33:40 +01:00
Anton Hansson
48acf101c3 Merge "Add genrule for combined-removed-dex" am: b0ba7618c8 am: dd7eb2b019 am: a07b8d4e93 am: c6cb7e9b1d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1446678

Change-Id: I2548dbfdc44faea3da2bc07290ee28fba9882d6f
2020-10-07 11:12:29 +00: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
897df7e3ca Merge "Re-submit "Add genrules for merged removed.txt files"" am: c2ee800f20 am: 41d0224165 am: c3edde5946 am: 18cf87b9f3 am: a5885916fd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1446816

Change-Id: I6c2a2d1a2b76d04720ead9f2c78075e2ddf8c65f
2020-10-05 14:24:27 +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
77ab884db2 Merge "Revert "Add genrules for merged removed.txt files"" am: 27b40fc234 am: de51075d79 am: 1691d6d02a am: 4c42b5ee98 am: e453ae2d45
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1442896

Change-Id: Ie33e6632618ca6a7af0efa95b36c3a2cc13a8bf3
2020-09-30 16:01:53 +00: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
140a18a403 Merge "Add genrules for merged removed.txt files" am: 19189d886b am: 554cdd7792 am: b16f6fed44 am: 41c5dbb0dd am: ccc36d6a46
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1438691

Change-Id: I99c9e633a872715c3136f2c9293ca1b1ac06bdbe
2020-09-30 11:50:30 +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
0eccccbde4 Add graphics to generated current.txt
We are also lacking appsearch, but it doesn't yet have api txt files.

Bug: 169034951
Bug: 169304493
Test: diff current.txt with generated txts
Change-Id: I0866605f0b4ba450ae824af00d24502fda060a5f
2020-09-24 12:09:25 +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