Commit Graph

17 Commits

Author SHA1 Message Date
Anton Hansson
a6258f826a Convert the sdk proto genrule to use soong var
Instead of baking it into the Android.bp file, define the canonical
value in build/make and reuse it here.

Bug: 195281582
Test: m current_sdkinfo and inspect
Change-Id: Ifd426ca602c14e7a5c5605622da11c992d0c5c59
Merged-In: Ifd426ca602c14e7a5c5605622da11c992d0c5c59
2021-08-31 14:15:56 +00:00
Mathew Inwood
c30a3959fb Merge "Add commit hook to require extra info in allowed_deps.txt additions." am: 1d1d2c9f63 am: 4f992a69f7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1784549

Change-Id: I7d948f7398342399300b8088e5cc14cab6476931
2021-08-04 10:20:53 +00:00
Mathew Inwood
8ee3d1b706 Add commit hook to require extra info in allowed_deps.txt additions.
For any CL that adds a new dependency to allowed_deps.txt, this will
require that extra information is provided in the commit message:
  Apex-Size-Increase:
  Previous-Platform-Support:
  Aosp-First:
  Test-Info:

Any CL that does not modify allowed_deps.txt, or that doesn't add new
dependency names to it, will be ignored.

Also open up ownership of allowed_deps.txt to allow anyone to make
changes there. We will use the information provided in the commit
message to verify additions periodically, rather than doing this in
code review.

Test: for sha in $(git log --format=%H build/allowed_deps.txt);
       do ./tools/check_allowed_deps.py $sha;
      done
Bug: 195303213
Change-Id: Ief9125d1eb51b29a7d3f05e5485ff41841d1d494
2021-08-02 16:46:13 +01:00
Anton Hansson
3886a9a7ed Remove workaround for IPSec buildfile not working
The bug has been fixed.

Bug: 190499958
Test: No
Change-Id: Iaa255586103daf76fa336560f3cd1b31668cf414
Merged-In: Iaa255586103daf76fa336560f3cd1b31668cf414
2021-06-28 12:56:35 +01:00
Anton Hansson
36ad23dddf Remove workaround for IPSec buildfile not working
The bug has been fixed.

Bug: 190499958
Test: No
Change-Id: Iaa255586103daf76fa336560f3cd1b31668cf414
2021-06-28 11:12:48 +01:00
Anton Hansson
f05db63424 Add tool to help finalize extension SDK
Not intended to be a long-term solution, but allows us to get off
the ground and download/commit the artifacts in an efficient way.

Bug: 188787081
Test: run script on test topic
Change-Id: Ia01929cd3614f18cdad1e1b23594dd473a11051e
Merged-In: Ia01929cd3614f18cdad1e1b23594dd473a11051e
(cherry picked from commit a874e95adc)
2021-06-15 11:33:12 +00:00
Anton Hansson
5921e2d5b3 Add conscrypt module to sdk extensions
Add visibility of the sdkinfo proto, as well as an enum for the module
to be used by SdkExtensions.

Bug: 188787081
Test: m com.android.conscrypt and inspect it
Change-Id: If8655c3328597580408a87e4c6dc4f92547a57e9
Merged-In: If8655c3328597580408a87e4c6dc4f92547a57e9
(cherry picked from commit ef9be67c2f)
2021-06-14 19:23:43 +01:00
Anton Hansson
a874e95adc Add tool to help finalize extension SDK
Not intended to be a long-term solution, but allows us to get off
the ground and download/commit the artifacts in an efficient way.

Bug: 188787081
Test: run script on test topic
Change-Id: Ia01929cd3614f18cdad1e1b23594dd473a11051e
2021-06-11 15:15:56 +01:00
Anton Hansson
16fe317db5 Bump current sdkinfo proto to version 1
This bumps the version embedded into modules to 1, which the
SdkExtensions module will require to set extension version 1.

Bug: 188787081
Test: CtsSdkExtensionsTestCases & sdkextensions_e2e_tests
Change-Id: I94e1cba76a7f50ba6531ca65830d20819600d34d
2021-06-09 11:15:44 +01:00
Anton Hansson
ef9be67c2f Add conscrypt module to sdk extensions
Add visibility of the sdkinfo proto, as well as an enum for the module
to be used by SdkExtensions.

Bug: 188787081
Test: m com.android.conscrypt and inspect it
Change-Id: If8655c3328597580408a87e4c6dc4f92547a57e9
2021-06-08 17:04:10 +01:00
Anton Hansson
0d974ddb4e Add scheduling module to sdk extensions
Add visibility of the sdkinfo proto, as well as an enum for the module
to be used by SdkExtensions.

Bug: 188787081
Test: m com.android.scheduling and inspect it
Change-Id: I5727e361b79ab0860d692261bde5f0b54279f791
2021-06-01 16:38:05 +01:00
Anton Hansson
6f31f06518 Merge "Rename sdkinfo extension from binarypb to pb" 2021-05-27 13:47:15 +00:00
Anton Hansson
c3b41d81ea Rename sdkinfo extension from binarypb to pb
binarypb is a bit of a mouthful, and it should be evident this pb is not
a textpb.

Bug: 189323663
Test: sdkextensions_e2e_tests
Merged-In: I20ec8ce30116b55a28ed32e0004ec2ff24955a1f
Change-Id: I20ec8ce30116b55a28ed32e0004ec2ff24955a1f
2021-05-27 10:04:29 +00:00
Anton Hansson
48293f029d Expand visibility of sdkinfo proto
Embed it into all the modules that are part of the updatable API
surface, ahead of actually introducing any new API levels with
requirements on these modules.

Also rename to current_sdkinfo for clarity.

Bug: 188787081
Test: Inspect apex files
Merged-In: I93ba55f1c1b4f60f36a26a2397088a5471eef850
Change-Id: I93ba55f1c1b4f60f36a26a2397088a5471eef850
2021-05-26 17:10:52 +01:00
Anton Hansson
9cd023a5c0 Rename sdkinfo extension from binarypb to pb
binarypb is a bit of a mouthful, and it should be evident this pb is not
a textpb.

Bug: 189323663
Test: sdkextensions_e2e_tests
Change-Id: I20ec8ce30116b55a28ed32e0004ec2ff24955a1f
2021-05-26 16:47:33 +01:00
Anton Hansson
bad2aab5a1 Expand visibility of sdkinfo proto
Embed it into all the modules that are part of the updatable API
surface, ahead of actually introducing any new API levels with
requirements on these modules.

Also rename to current_sdkinfo for clarity.

Bug: 188787081
Test: Inspect apex files
Change-Id: I93ba55f1c1b4f60f36a26a2397088a5471eef850
2021-05-24 12:24:22 +01:00
satayev
075d07c591 Move SdkExtensions/proto to packages/modules/common.
The proto definitions may be needed at build time to generate appropriate
configs for the modules. Unbundled ART branches do not include
packages/modules/SdkExtenstion in their manifest; so put the proto in a
project that should be visible to all unbundled modules.

Move any relevant tools to packages/modules/common/tools as well.

Bug: 180105615
Test: m nothing
Change-Id: I4efa4300553af6b321f46adb29b8cc90e4556955
2021-05-10 18:27:54 +01:00