Commit Graph

22232 Commits

Author SHA1 Message Date
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
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
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
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
Paul Duffin
f7a6433bab java_sdk_library: Propagate naming_scheme to snapshot
Bug: 155164730
Test: m nothing
Change-Id: Iec7c52d2102b6294540090f3c1e32bd9d8cc7da8
2020-05-13 20:40:53 +01:00
Paul Duffin
38b5785e3f java_sdk_library_import: Propagate prefer to child modules
Bug: 155164730
Test: m nothing
Change-Id: Idb06d79baf346ac570beada79880814c5ef6bb50
2020-05-13 20:40:53 +01:00
Dan Shi
30ed3d4ce9 Use StopServicesSetup to stop/start framework.
Bug: 155774142
Test: atest VtsHalWifiV1_2TargetTest (update Android.bp with
disable_framework: true)

Change-Id: I5d5326f415352d50ace7f456d29b257d1d769318
Merged-In: I5d5326f415352d50ace7f456d29b257d1d769318
2020-05-13 17:27:56 +00:00
Paul Duffin
080f5ee6f2 java_sdk_library: Add sdk_version for API scopes
Allow the sdk_version against which the stubs for a scope are compiled
to be specified in the module on a per scope basis.

Bug: 155164730
Test: m nothing
Merged-In: I5881e5ee7c2169c30f544882344a60a602dae917
Change-Id: I5881e5ee7c2169c30f544882344a60a602dae917
(cherry picked from commit 87a05a389d)
2020-05-13 18:07:09 +01:00
Dan Shi
da6ea7119d Merge "Use StopServicesSetup to stop/start framework." am: 61b5e26f27 am: c022ff15b1
Change-Id: Ibab36c9ea3b3c2612aa866561fcc2ddd5ce20dbc
2020-05-13 16:54:02 +00:00
Paul Duffin
6195b4f87d java_sdk_library: Add sdk_version for API scopes am: 87a05a389d am: e04ce887d2
Change-Id: Idc356ed16367c488a111e61609f6c8ff33c3dc06
2020-05-13 16:53:29 +00:00
Dan Shi
c022ff15b1 Merge "Use StopServicesSetup to stop/start framework." am: 61b5e26f27
Change-Id: I7d2292a57e882c1e80235e49dc333629a56f9481
2020-05-13 16:29:23 +00:00
Paul Duffin
e04ce887d2 java_sdk_library: Add sdk_version for API scopes am: 87a05a389d
Change-Id: I845dd9c0fcbde173cec1a6ecbc7301b6fd7b98cc
2020-05-13 16:29:07 +00:00
Dan Shi
61b5e26f27 Merge "Use StopServicesSetup to stop/start framework." 2020-05-13 16:19:07 +00:00
Jooyung Han
bbc3fb780b Reland "enforce sdk_version for JNI libs for updatable APKs"
JNI libs for "updatable" APKs or APKs in "updatable" APEXes should set
sdk_version which is equal to or less than APK's min_sdk_version.

In fact, we'd better check if min_sdk_version of JNI libs matches(or is
earlier than) min_sdk_version of the APK. But for now the build system
can't handle sdk_version/min_sdk_version correctly for JNI libs. That's
why sdk_version of JNI libs is enforced to match with min_sdk_version
of APK in this change.

(original commit: 98c4750f39)

Bug: 145796956
Test: m
Change-Id: I08543ccee7dfda0559a1fca108ceb5c28f84943f
2020-05-14 00:19:45 +09:00
Paul Duffin
1685b321ab [automerger skipped] Remove unused Module.visibility() method am: 1f4ad0e44d -s ours
am skip reason: Change-Id Iee7a9ab9d816ed1948e2c7cde23f9907cfda337d with SHA-1 36c5b8d0b8 is in history

Change-Id: I366d3539e4585e9f013d90330a900178bc0eff19
2020-05-13 14:48:17 +00:00
Paul Duffin
b218cec5bd [automerger skipped] Add //visibility:override to allow control over inheritance am: 31c43e7fb3 -s ours
am skip reason: Change-Id I8a9c9c5a1bdceaee387c08864ae2b34629e0d46f with SHA-1 51084ff6cf is in history

Change-Id: Ib818feda122049c3b02d415efe759702eaeeba6b
2020-05-13 14:48:09 +00:00
Paul Duffin
8d04588ff4 [automerger skipped] java_sdk_library: Add framework-modules naming scheme am: def8a89a22 -s ours
am skip reason: Change-Id Ic859a61de155b3e582c17f6ab5e9298f5f4e709a with SHA-1 6c9c5fc4bc is in history

Change-Id: Idffd5de681a123a5cea7f88eb852526dab2c3e44
2020-05-13 14:02:12 +00:00
Paul Duffin
c7a9b995c7 [automerger skipped] java_sdk_library: Remove some almost single use constants am: 1c094a01c5 -s ours
am skip reason: Change-Id I966e82b8ae67624da168e05f5a2b062b832cb8cd with SHA-1 dd9d0740fa is in history

Change-Id: I10da6a3bff1f8da9e777f8aded587281b81bb7ef
2020-05-13 14:02:06 +00:00
Paul Duffin
f450d41ac6 [automerger skipped] java_sdk_library: Delegate component module to naming scheme am: 1a724e666f -s ours
am skip reason: Change-Id I708657661188ea4a14a4dd8c6bc4b46237bbe5e0 with SHA-1 1b1e8069ec is in history

Change-Id: I7584cd25b318e30f7db6955f6d7c1696d9a3c973
2020-05-13 14:02:00 +00:00
Paul Duffin
4e4a38a62f [automerger skipped] java_sdk_library: Extract child module naming to common struct am: b74ee3e727 -s ours
am skip reason: Change-Id I9be9aab07252b491ab292b8847138a93b487cf53 with SHA-1 c3091c8c19 is in history

Change-Id: I24c72ebda8a236ec1b9a4d352ac1de52729b52cf
2020-05-13 14:01:54 +00:00
Paul Duffin
45fa8249f8 [automerger skipped] java_sdk_library: Allow separate api/stubs source modules am: a377e4c85e -s ours
am skip reason: Change-Id Iea7d59852d7aeb503120acf3c44e08eb0d9d07b9 with SHA-1 0ff08bdb07 is in history

Change-Id: Ieaeaff0b5562874ba3683c461e4da14f47e7cec9
2020-05-13 14:01:48 +00:00
Paul Duffin
82f1eec3ac [automerger skipped] java_sdk_library: Preserve sdk_version: "none" in snapshot am: 153501f661 -s ours
am skip reason: Change-Id Icf7c20dc109a773430768c1a2d91c674551dbc1b with SHA-1 780c5f4715 is in history

Change-Id: I70bf9330beaa98207950cdc67025f4804b9a9f48
2020-05-13 14:01:42 +00:00
Paul Duffin
7ff856f311 [automerger skipped] Allow sdk_version: "none" to be used in prebuilts/ am: cd9b6971c4 -s ours
am skip reason: Change-Id Iffce78cbce88a8341146bf19e78acf25fc69f2b0 with SHA-1 e5c3b85ee5 is in history

Change-Id: Ifc42a41c13d4654e574ee672cf9708a1390880d6
2020-05-13 14:01:36 +00:00
Paul Duffin
efcbb61e8a [automerger skipped] Enable api_lint in java_sdk_library am: 8986cc947c -s ours
am skip reason: Change-Id I87ca5a942228cf6af1a9939f0334d6fc46c39a63 with SHA-1 160fe41c39 is in history

Change-Id: Ife1c3e7c7d9d2d27329320bfc1b2efce00c902ed
2020-05-13 14:01:30 +00:00
Paul Duffin
1f4ad0e44d Remove unused Module.visibility() method
Bug: 155787200
Test: m nothing
Merged-In: Iee7a9ab9d816ed1948e2c7cde23f9907cfda337d
Change-Id: Iee7a9ab9d816ed1948e2c7cde23f9907cfda337d
(cherry picked from commit 36c5b8d0b8)
2020-05-13 13:50:34 +01:00
Paul Duffin
31c43e7fb3 Add //visibility:override to allow control over inheritance
Visibility rules can be 'inherited' in one of two ways. Either from
defaults or from a module that called ctx.CreateModule(...).
Previously, in both cases the inheriting module could only append
additional visibility rules to the end of the inherited rules. That
made it impossible to restrict the visibility by removing or ignore
inherited rules.

The //visibility:override rectifies that by allowing the inheriting
module to ignore all the rules that they would have inherited. It can
only go at the beginning of a list of rules specified in a module but
after defaults are applied it can end up in the middle of a list of
rules. In that case it behaves as if all the rules up to and including
the //visibility:override rule were discarded.

It can be used with //visibility:private to override
//visibility:public and vice versa.

Bug: 155787200
Test: m nothing
Merged-In: I8a9c9c5a1bdceaee387c08864ae2b34629e0d46f
Change-Id: I8a9c9c5a1bdceaee387c08864ae2b34629e0d46f
(cherry picked from commit 51084ff6cf)
2020-05-13 13:50:34 +01:00
Treehugger Robot
8c30912b64 Merge "Remove unused Module.visibility() method" am: 717e50c630 am: 5c9c0e79e0
Change-Id: Iebd9e08a399a827bda6441326d7884ae5cd1bbf7
2020-05-13 12:22:59 +00:00
Treehugger Robot
ecc80fce50 Merge "Add //visibility:override to allow control over inheritance" am: 5bc07e59e3 am: 290ae01f42
Change-Id: I4018d83a19e854d5ba38452ac76f784b3fe78061
2020-05-13 12:22:52 +00:00
Paul Duffin
87a05a389d java_sdk_library: Add sdk_version for API scopes
Allow the sdk_version against which the stubs for a scope are compiled
to be specified in the module on a per scope basis.

Bug: 155164730
Test: m nothing
Change-Id: I5881e5ee7c2169c30f544882344a60a602dae917
2020-05-13 13:09:23 +01:00
Treehugger Robot
5c9c0e79e0 Merge "Remove unused Module.visibility() method" am: 717e50c630
Change-Id: I25746735f0a7ab6219888925d106291c66d064b8
2020-05-13 12:04:47 +00:00
Treehugger Robot
290ae01f42 Merge "Add //visibility:override to allow control over inheritance" am: 5bc07e59e3
Change-Id: I7e73f5a0fb5a1a6665b80aa8b3bdcb3bf4ae8199
2020-05-13 12:04:39 +00:00
Treehugger Robot
717e50c630 Merge "Remove unused Module.visibility() method" 2020-05-13 11:53:49 +00:00
Treehugger Robot
5bc07e59e3 Merge "Add //visibility:override to allow control over inheritance" 2020-05-13 11:53:43 +00:00
Paul Duffin
def8a89a22 java_sdk_library: Add framework-modules naming scheme
Matches the naming scheme used by the separate manually created modules
that will be replaced by java_sdk_library's automatically created
components. This will simplify conversion to java_sdk_library as it
will allow developers to concentrate on getting the conversion correct
without also having to worry about name changes. It will also allow the
conversions to be parallelized as many of the references to the
components are in places where conflicts are likely.

Test: m nothing
Bug: 155480189
Merged-In: Ic859a61de155b3e582c17f6ab5e9298f5f4e709a
Change-Id: Ic859a61de155b3e582c17f6ab5e9298f5f4e709a
(cherry picked from commit 6c9c5fc4bc)
2020-05-13 11:29:01 +01:00
Paul Duffin
1c094a01c5 java_sdk_library: Remove some almost single use constants
The constants are only used in one place in the code and in the test.
This change switches the test code to use the apiScope methods to
generate the names and then inlines the constants in those methods. It
makes it easier to see the naming convention.

Test: m nothing
Bug: 155480189
Merged-In: I966e82b8ae67624da168e05f5a2b062b832cb8cd
Change-Id: I966e82b8ae67624da168e05f5a2b062b832cb8cd
(cherry picked from commit dd9d0740fa)
2020-05-13 11:29:01 +01:00