Commit graph

22265 commits

Author SHA1 Message Date
Treehugger Robot
b5871f6d52 Merge "Restore "Default to zero-initialization instead of pattern."" am: 59759dff24 am: b8c6169aff
Change-Id: I34c71e2e7d23af5355a571435bbffe15f6c72f1f
2020-05-15 05:53:44 +00:00
Treehugger Robot
b8c6169aff Merge "Restore "Default to zero-initialization instead of pattern."" am: 59759dff24
Change-Id: Ieae271ee82bb82252032a231dfcc21303af3a5cf
2020-05-15 05:37:18 +00:00
Treehugger Robot
59759dff24 Merge "Restore "Default to zero-initialization instead of pattern."" 2020-05-15 05:20:35 +00:00
Jooyung Han
b442db2b39 Merge "Remove ApexBundleDepsInfo.MinSdkVersion()" am: b9d65417c3 am: 06febdf2bb
Change-Id: Ie3f0e84cca29f26bd607e43a96592e078c62ead3
2020-05-15 00:17:57 +00:00
Treehugger Robot
d5a2de471b [automerger skipped] Merge "Add signing certificate lineage support to soong" am: dcd0fc4be7 am: 6c458f1636 -s ours
am skip reason: Change-Id I65a92d6c40057dcc01950991fb7be485de1c9080 with SHA-1 70dd74dde7 is in history

Change-Id: I9538c4bdd9bbcd0ae927e760d9a0159ae00e6210
2020-05-15 00:17:49 +00:00
Colin Cross
13f9a2ec06 Merge "Don't use SDK variant for vendor JNI libraries" am: cb1d161666 am: d75524f322
Change-Id: I5684f17281e31e8d6ffc9d0c7541d55c1bbd0bba
2020-05-15 00:17:18 +00:00
Jooyung Han
06febdf2bb Merge "Remove ApexBundleDepsInfo.MinSdkVersion()" am: b9d65417c3
Change-Id: Ic0ed8e5bc130d72d357e590f8d546513c84551e3
2020-05-15 00:04:59 +00:00
Treehugger Robot
6c458f1636 Merge "Add signing certificate lineage support to soong" am: dcd0fc4be7
Change-Id: I82d5c8453c44facd3c0d07b0cf5e793b636988f8
2020-05-15 00:04:46 +00:00
Colin Cross
d75524f322 Merge "Don't use SDK variant for vendor JNI libraries" am: cb1d161666
Change-Id: If151e4668bca65b1928a99c6c32ecb05fae0e16c
2020-05-15 00:04:34 +00:00
Paul Duffin
5fe323e986 [automerger skipped] Correct module_lib scope name am: 0f27063a9e -s ours
am skip reason: Change-Id I7dbafd7164d5da600ca45c39a7f93a5a40027a1f with SHA-1 6b836ba566 is in history

Change-Id: I25f7c833b4b2294efb5a1ddaf941aa9dd9964a42
2020-05-15 00:03:42 +00:00
Jooyung Han
b9d65417c3 Merge "Remove ApexBundleDepsInfo.MinSdkVersion()" 2020-05-14 23:13:21 +00:00
Treehugger Robot
dcd0fc4be7 Merge "Add signing certificate lineage support to soong" 2020-05-14 23:11:24 +00:00
Colin Cross
cb1d161666 Merge "Don't use SDK variant for vendor JNI libraries" 2020-05-14 22:59:47 +00:00
Martin Stjernholm
9d28688c08 Merge changes I404f6e5c,I0d2d86f0 am: 08f72a9709 am: 52deb9ba96
Change-Id: I840a2f106fa2a04b4f4c8d5d905d820e1ae6e52f
2020-05-14 22:22:26 +00:00
Martin Stjernholm
52deb9ba96 Merge changes I404f6e5c,I0d2d86f0 am: 08f72a9709
Change-Id: Ief7133f3c2f1bebce3699233dab4576607f92630
2020-05-14 22:05:18 +00:00
Martin Stjernholm
08f72a9709 Merge changes I404f6e5c,I0d2d86f0
* changes:
  Add explicit visibility on the self package in EffectiveVisibilityRules.
  Don't print :__pkg__ for package rules, since that's the default.
2020-05-14 21:49:05 +00:00
Martin Stjernholm
0641d189d0 Add explicit visibility on the self package in EffectiveVisibilityRules.
Modules in a package is implicitly visible within the same package.
When making effective visibility rules which work from another location
that visibility needs to be mentioned explicitly. In practice this
allows prebuilts to remain visible to other modules in the source
package when the prebuilts are preferred.

Test: m nothing
Test: m conscrypt-module-sdk, check that the snapshot Soong modules give
  visibility to //external/conscrypt
Bug: 151303681
Change-Id: I404f6e5ca7021974a8c7be5e4d6b4982c050b8a5
2020-05-14 16:50:59 +01:00
Martin Stjernholm
01407c525a Don't print :__pkg__ for package rules, since that's the default.
To reduce clutter a little.

Test: m nothing
Change-Id: I0d2d86f00c3d38e603d6f58c4b1dd9a4170bf819
2020-05-14 16:50:59 +01:00
Liz Kammer
8d501ef107 Merge "Add test data dependencies to APEX." am: 6109adaee0 am: 5b5cecd94e
Change-Id: I2589597f744dd62d0799f20d7de79dab4e8b07ae
2020-05-14 15:30:55 +00:00
Liz Kammer
5b5cecd94e Merge "Add test data dependencies to APEX." am: 6109adaee0
Change-Id: Ide79cc90cd20037dd60737b95272505ba91b95ad
2020-05-14 15:20:16 +00:00
Liz Kammer
6109adaee0 Merge "Add test data dependencies to APEX." 2020-05-14 15:06:49 +00:00
Paul Duffin
0f27063a9e Correct module_lib scope name
The module_lib scope should be called module-lib in order to pick up
the latest filegroup. Without it the API lint does not use a baseline
and so reports issues with released and unchangeable APIs.

It is also needed for the correct dist path.

Test: m update-api
Bug: 155164730
Merged-In: I7dbafd7164d5da600ca45c39a7f93a5a40027a1f
Change-Id: I7dbafd7164d5da600ca45c39a7f93a5a40027a1f
(cherry picked from commit 6b836ba566)
2020-05-14 12:16:16 +01:00
Treehugger Robot
6b41bb2b46 Merge "Correct module_lib scope name" am: 5e5478787b am: 2f92f179b7
Change-Id: Icb8f0c9b5832476bd00cd12f2c75ee55d686dce2
2020-05-14 10:56:18 +00:00
Treehugger Robot
2f92f179b7 Merge "Correct module_lib scope name" am: 5e5478787b
Change-Id: I8ac276c21f63d4c484ae3f20ad30db6087d8de95
2020-05-14 10:40:45 +00:00
Treehugger Robot
5e5478787b Merge "Correct module_lib scope name" 2020-05-14 10:23:26 +00:00
Paul Duffin
349bf7cb5d [automerger skipped] java_sdk_library_import: Propagate prefer to child modules am: dd89a28104 -s ours
am skip reason: Change-Id Idb06d79baf346ac570beada79880814c5ef6bb50 with SHA-1 38b5785e3f is in history

Change-Id: I7badce8776b0b3b0d503baf38d0beaca80b52b89
2020-05-14 08:10:14 +00:00
Treehugger Robot
5a5194a485 Merge "Remove reference to libz_current." am: 6a53c65ebd am: 02d3e4e600
Change-Id: I616b77a4f1fae6370b30cbdffdd6ac6bc8d94ee6
2020-05-14 04:47:28 +00:00
Treehugger Robot
02d3e4e600 Merge "Remove reference to libz_current." am: 6a53c65ebd
Change-Id: Ib0bfa42c5f4edfa78f6119c3e7f70d3379534225
2020-05-14 04:34:41 +00:00
Treehugger Robot
6a53c65ebd Merge "Remove reference to libz_current." 2020-05-14 04:26:12 +00:00
Stephen Hines
5c873acdb5 Restore "Default to zero-initialization instead of pattern."
This reverts commit 39fa1882ac.

Reason for revert: Original test was broken (go/oag/1311137), so restoring correct build/soong change.

Bug: http://b/156464649
Test: atest CtsNNAPITestCases:TensorRankConstraint

Change-Id: Id87b6a265a3541e95bcf2d68097738929e88e8b2
2020-05-14 01:00:46 +00:00
Paul Duffin
6b836ba566 Correct module_lib scope name
The module_lib scope should be called module-lib in order to pick up
the latest filegroup. Without it the API lint does not use a baseline
and so reports issues with released and unchangeable APIs.

It is also needed for the correct dist path.

Test: m update-api
Bug: 155164730
Change-Id: I7dbafd7164d5da600ca45c39a7f93a5a40027a1f
2020-05-14 00:53:50 +01:00
Paul Duffin
7f43899166 Merge "java_sdk_library: Propagate naming_scheme to snapshot" am: f9088b03c2 am: 2cf524acd3
Change-Id: I0b07ea455d48287a261554df19d8757b3cc1fbe2
2020-05-13 23:51:11 +00:00
Treehugger Robot
0590ea3bca Merge "Revert "Default to zero-initialization instead of pattern."" am: 73e260fa37 am: c885911311
Change-Id: I237ce809a4314141100aa98a3c9274f59fbc120d
2020-05-13 23:51:04 +00:00
Treehugger Robot
b24201202c Merge "Reland "enforce sdk_version for JNI libs for updatable APKs"" am: bb008e6213 am: eb07296b5b
Change-Id: Ibc0335f3cdf08c13ea9dd26472db50b91c63135c
2020-05-13 23:50:51 +00:00
Paul Duffin
2cf524acd3 Merge "java_sdk_library: Propagate naming_scheme to snapshot" am: f9088b03c2
Change-Id: If40f95daba8313506685b6851a7cc23d22178943
2020-05-13 23:50:42 +00:00
Paul Duffin
f9088b03c2 Merge "java_sdk_library: Propagate naming_scheme to snapshot" 2020-05-13 23:49:20 +00:00
Treehugger Robot
c885911311 Merge "Revert "Default to zero-initialization instead of pattern."" am: 73e260fa37
Change-Id: I9a85fc5e14af9c2f96e7606472b711d8a0ee85e5
2020-05-13 23:44:24 +00:00
Treehugger Robot
73e260fa37 Merge "Revert "Default to zero-initialization instead of pattern."" 2020-05-13 23:41:28 +00:00
Treehugger Robot
eb07296b5b Merge "Reland "enforce sdk_version for JNI libs for updatable APKs"" am: bb008e6213
Change-Id: I37b3c56f3f1bc72516172fcf62af6e78d02faf4e
2020-05-13 23:36:50 +00:00
Treehugger Robot
bb008e6213 Merge "Reland "enforce sdk_version for JNI libs for updatable APKs"" 2020-05-13 23:24:26 +00:00
Jooyung Han
98d63e1cc7 Remove ApexBundleDepsInfo.MinSdkVersion()
For java.AndroidApp app, app.MinSdkVersion() was selected from
ApexBundleDepsInfo, not from java.Module.
This caused app.MinSdkVersion() to return "" always.

Besides, having two embeded fields and relying on depth to choose one of
them makes it hard to read.

Bug: 156537348
Test: m
Change-Id: Ib525b2f5132c596db8e33492d0a565ea23e91d1c
2020-05-14 07:44:03 +09:00
Paul Duffin
dd89a28104 java_sdk_library_import: Propagate prefer to child modules
Bug: 155164730
Test: m nothing
Merged-In: Idb06d79baf346ac570beada79880814c5ef6bb50
Change-Id: Idb06d79baf346ac570beada79880814c5ef6bb50
(cherry picked from commit 38b5785e3f)
2020-05-13 23:39:01 +01:00
Paul Duffin
06ccf23389 java_sdk_library_import: Propagate prefer to child modules am: 38b5785e3f am: b08ba780c5
Change-Id: I88dbbef53348faa9dfdaa0cbe41f4fb2e5c7fd24
2020-05-13 22:15:17 +00:00
Paul Duffin
b08ba780c5 java_sdk_library_import: Propagate prefer to child modules am: 38b5785e3f
Change-Id: Ida8134f076911902c08e0656e54fd04395c793f6
2020-05-13 21:58:24 +00:00
Liz Kammer
e2b27f473f Add signing certificate lineage support to soong
(This is a cherry pick.)

Test: app_test
Bug: 153366049
Merged-In: I65a92d6c40057dcc01950991fb7be485de1c9080
Change-Id: I65a92d6c40057dcc01950991fb7be485de1c9080
2020-05-13 14:30:53 -07:00
TreeHugger Robot
cd20bf7ab0 [automerger skipped] Merge "Use StopServicesSetup to stop/start framework." into rvc-dev am: fa891cb178 -s ours
am skip reason: Change-Id I5d5326f415352d50ace7f456d29b257d1d769318 with SHA-1 8aa401023b is in history

Change-Id: I93a339c9af7ed0e83a24bd8b08d14e82513f9434
2020-05-13 21:29:26 +00:00
Elliott Hughes
9912ee2f02 Remove reference to libz_current.
This no longer exists.

Bug: https://issuetracker.google.com/155351357
Test: treehugger
Change-Id: Ie38c971759acb0141cba6341f95c67effadd93a6
2020-05-13 14:20:12 -07:00
TreeHugger Robot
fa891cb178 Merge "Use StopServicesSetup to stop/start framework." into rvc-dev 2020-05-13 21:13:50 +00:00
Paul Duffin
45cd660e99 [automerger skipped] java_sdk_library: Add sdk_version for API scopes am: 080f5ee6f2 -s ours
am skip reason: Change-Id I5881e5ee7c2169c30f544882344a60a602dae917 with SHA-1 87a05a389d is in history

Change-Id: I15da603bd2cde25d1c6b7735ff1ee06904159abc
2020-05-13 20:45:10 +00:00
Stefano Galarraga
39fa1882ac Revert "Default to zero-initialization instead of pattern."
This reverts commit 7871416eec.

Reason for revert: This change is breaking CtsNNAPITestCases.TensorRankConstraint (http://b/156464649). 

Change-Id: I8831993a7d3c2079a8d76a23dfbdf9c7c1543181
2020-05-13 20:09:28 +00:00