Commit Graph

2260 Commits

Author SHA1 Message Date
Ulyana Trafimovich
b59f9f2d52 Merge "Add "updatable" property to ApexModule interface." am: dc9510537a am: 0f4722751b
Change-Id: I475093d9bf96a94a54f4c64ad409f63a28b2ee95
2020-04-24 09:05:01 +00:00
Ulyana Trafimovich
dc9510537a Merge "Add "updatable" property to ApexModule interface." 2020-04-24 08:25:34 +00:00
Ulya Trafimovich
7c140d828a Add "updatable" property to ApexModule interface.
For a given variant of a module that implements ApexModule interface,
the "updatable" property tests if this variant comes from an updatable
apex. For platform variants it is always false.

Test: lunch aosp_walleye-userdebug && m nothing
Bug: 138994281
Change-Id: I2d4c54fb397e29dc9b3203be7fb17be4536529f7
2020-04-23 11:58:53 +01:00
Anton Hansson
14f42d34af Merge "Remove unused arguments in droiddoc" 2020-04-23 09:56:40 +00:00
Anton Hansson
a1cd23b130 Merge "Remove unused arguments in droiddoc" into rvc-dev am: 7aa5899e56
Change-Id: I4ddf9c8a68e98533c7e6c85a76bc258b33dcb6f7
2020-04-23 09:52:01 +00:00
Anton Hansson
0f15a9f866 Remove unused arguments in droiddoc
Nothing passes these arguments, so it's dead code.

There is a lot of other cruft in this file that is effectively
dead code, but required further cleanup.

Bug: 152479829
Test: m
Change-Id: Ib2630d4d49f21003b17e2331b0900e8df0a27e66
Merged-In: Ib2630d4d49f21003b17e2331b0900e8df0a27e66
(cherry picked from commit 0ee713aa0e)
2020-04-22 21:15:09 +01:00
Anton Hansson
0ee713aa0e Remove unused arguments in droiddoc
Nothing passes these arguments, so it's dead code.

There is a lot of other cruft in this file that is effectively
dead code, but required further cleanup.

Bug: 152479829
Test: m
Change-Id: Ib2630d4d49f21003b17e2331b0900e8df0a27e66
2020-04-22 21:09:46 +01:00
TreeHugger Robot
3b5e28a92a Merge "Make sure car-lib system APIs are not changing unintentionally" into rvc-dev am: 077630ad2c
Change-Id: Ia75daa32c2f62bbcb075365f20bb1c47bfbaeb09
2020-04-21 23:37:13 +00:00
TreeHugger Robot
077630ad2c Merge "Make sure car-lib system APIs are not changing unintentionally" into rvc-dev 2020-04-21 23:21:07 +00:00
Makoto Onuki
a573f1906f Make sure car-lib system APIs are not changing unintentionally
Soon had a special rule to skip the "released-api" compatibility
check on the car-lib system API. We should enable it.

Bug: 154632388
Test: m droid
Change-Id: Ib4e584def7e786e3e129cd2bfb23958ac9b4b72d
Merged-in: Ib4e584def7e786e3e129cd2bfb23958ac9b4b72d
2020-04-21 12:37:37 -07:00
Makoto Onuki
91ec494500 Make sure car-lib system APIs are not changing unintentionally
Soon had a special rule to skip the "released-api" compatibility
check on the car-lib system API. We should enable it.

Bug: 154632388
Test: m droid
Change-Id: Ib4e584def7e786e3e129cd2bfb23958ac9b4b72d
2020-04-21 12:01:04 -07:00
satayev
a1f14150c3 Merge "Remove Android compat annotations on jarjar transform." am: aa52a04fdd am: 29a95d1f83
Change-Id: I3161785662dc0eb9c6c0872579f7eca5d400a528
2020-04-20 16:01:09 +00:00
Artur Satayev
a479d943dd Remove Android compat annotations on jarjar transform.
Set a system property to enable Android specific transformer that drops
UnsupportedAppUsage annotation for repackaged classes to avoid adding
unneeded hidden api symbols on jarjar.

Bug: 146418363
Test: m, manual diff hiddenapi-flags.csv
Exempt-From-Owner-Approval: patch approved by owner
Change-Id: I10b49feb15257301574162b5d389cbc30277f672
Merged-In: I10b49feb15257301574162b5d389cbc30277f672
(cherry picked from commit 762d9f38af)
2020-04-20 16:22:42 +01:00
Artur Satayev
762d9f38af Remove Android compat annotations on jarjar transform.
Set a system property to enable Android specific transformer that drops
UnsupportedAppUsage annotation for repackaged classes to avoid adding
unneeded hidden api symbols on jarjar.

Bug: 146418363
Test: m, manual diff hiddenapi-flags.csv
Exempt-From-Owner-Approval: patch approved by owner
Change-Id: I10b49feb15257301574162b5d389cbc30277f672
2020-04-20 11:17:18 +00:00
Anton Hansson
39a06440cd Merge "Remove _API_FILE variables" into rvc-dev 2020-04-19 07:54:27 +00:00
Anton Hansson
c799160807 Merge "Remove _API_FILE variables" am: 43b6019eb2 am: a39b4ec173
Change-Id: I8c21de32cd7711a6fecf332bf40c74deef0bad36
2020-04-18 10:02:41 +00:00
Anton Hansson
336f63cfb2 Remove _API_FILE variables
There are no known usages of these variables, and many have been
incorrectly set for a long time.

Also convert the <module> phony for api txt to androidmk.

Bug: 152479829
Test: m
Change-Id: Iff355041d88eb59ac47dd19a03e993cf1ce3927e
Merged-In: Iff355041d88eb59ac47dd19a03e993cf1ce3927e
2020-04-18 10:15:11 +01:00
Anton Hansson
43b6019eb2 Merge "Remove _API_FILE variables" 2020-04-18 09:13:49 +00:00
Jooyung Han
0b2255f411 Merge "apex: respect filename property for apk-in-apex" am: 79a24f2ca8 am: 4c70b2800f
Change-Id: I8077fdf16054e2c1f958af4a2ce4452767b5fa8f
2020-04-18 03:22:38 +00:00
Jooyung Han
79a24f2ca8 Merge "apex: respect filename property for apk-in-apex" 2020-04-18 02:23:07 +00:00
Anton Hansson
27d9ec1860 Remove _API_FILE variables
There are no known usages of these variables, and many have been
incorrectly set for a long time.

Also convert the <module> phony for api txt to androidmk.

Bug: 152479829
Test: m
Change-Id: Iff355041d88eb59ac47dd19a03e993cf1ce3927e
2020-04-17 20:27:11 +01:00
Artur Satayev
0f43edcfc7 Merge "Check updatable APKs compile against managed SDKs." into rvc-dev 2020-04-16 13:34:39 +00:00
Artur Satayev
e5ac15a1b7 Check updatable APKs compile against managed SDKs.
As a follow up, this property will be set to APKs participating in mainline program.

Bug: 153333044
Test: m
Change-Id: I6ea2f3c1d26992259e4e9e6a6d8cecf091d39c43
Merged-In: I6ea2f3c1d26992259e4e9e6a6d8cecf091d39c43
(cherry picked from commit 2db1c3f1c4)
Exempt-From-Owner-Approval: clean cherry-pick
2020-04-16 13:34:13 +00:00
satayev
715a32b6de Merge "Check updatable APKs compile against managed SDKs." am: 0b3e45abd0 am: 2e40b33564
Change-Id: Ie906cb44cc73f867e0fdcef34a97966ad63ad45d
2020-04-15 17:27:59 +00:00
Anton Hansson
82dc4c8cff Merge "Create a framework.aidl for non-updatable platform" into rvc-dev am: c6fff020f5
Change-Id: Ia19b9cf99ca3c2a9fcefe4f0d864e57e486fb04f
2020-04-15 16:56:36 +00:00
Anton Hansson
c6fff020f5 Merge "Create a framework.aidl for non-updatable platform" into rvc-dev 2020-04-15 11:13:36 +00:00
Artur Satayev
2db1c3f1c4 Check updatable APKs compile against managed SDKs.
As a follow up, this property will be set to APKs participating in mainline program.

Bug: 153333044
Test: m
Change-Id: I6ea2f3c1d26992259e4e9e6a6d8cecf091d39c43
2020-04-15 12:06:13 +01:00
Jaewoong Jung
f472871e00 Merge "Add libs properties to runtime_resource_overlay." 2020-04-13 13:27:25 +00:00
Jaewoong Jung
fe3c7f6261 Add libs properties to runtime_resource_overlay.
(This is a cherry-pick change.)

Test: app_test.go
Test: Converted an existing RRO module.
Bug: 148788111
Change-Id: I723c7175760da019d38893e54f236c45f4c973ea
Merged-In: I723c7175760da019d38893e54f236c45f4c973ea
2020-04-10 16:29:40 -07:00
Jaewoong Jung
5209b4bd9f Merge "Add libs properties to runtime_resource_overlay." into rvc-dev am: 1883126573
Change-Id: I74d3bacdeefefd2736448164841081668c714072
2020-04-10 18:06:40 +00:00
Jaewoong Jung
1883126573 Merge "Add libs properties to runtime_resource_overlay." into rvc-dev 2020-04-10 17:41:19 +00:00
Jaewoong Jung
ca095d786a Add libs properties to runtime_resource_overlay.
Test: app_test.go
Test: Converted an existing RRO module.
Bug: 148788111
Change-Id: I723c7175760da019d38893e54f236c45f4c973ea
2020-04-10 07:05:07 -07:00
Paul Duffin
d4c0356dad Create prebuilt api modules in load hook not mutator
An attempt to reference one of the prebuilt modules directly from an
Android.bp file highlighted a bug. The prebuilt_apis module used a
mutator to create filegroup and java_import modules for a set of api
versions. That mutator ran after the "prebuilts" mutator which handled
the renaming of prebuilt modules when the matching source module was
not present. That meant that the only way to reference the module was
by explicitly adding the prefix "prebuilt_".

This change fixed that bug by creating the modules in a load hook rather
that a mutator. This ensures that the prebuilt modules are present well
before the "prebuilts" mutator is run. Removing the mutator also removes
an unnecessary traversal of the whole dependency tree.

It also updated the documentation to explain that it creates
java_import modules as well as the filegroup modules.

(cherry picked from 47f6315f01)

Bug: 153649372
Test: m droid
Change-Id: Id44dce8ca9968ae903345df6ef1c4f1be9cb76c5
Merged-In: Id44dce8ca9968ae903345df6ef1c4f1be9cb76c5
2020-04-10 07:44:52 +01:00
Treehugger Robot
a325487e9f Merge "Export API files as part of the java_sdk_library" am: 318f68226b am: 7dc6778d73
Change-Id: I1196b3e1acf851db7e69b2ad86d50a9f2cb14ed9
2020-04-10 04:53:37 +00:00
Treehugger Robot
84adeb3b9d Merge "Export stub sources as part of the java_sdk_library" am: b661961825 am: c61ca98d63
Change-Id: Ic8efc6c417e65bbc28639cafb068ac5674734cf1
2020-04-10 04:53:26 +00:00
Treehugger Robot
318f68226b Merge "Export API files as part of the java_sdk_library" 2020-04-10 03:57:11 +00:00
Treehugger Robot
b661961825 Merge "Export stub sources as part of the java_sdk_library" 2020-04-10 03:57:04 +00:00
TreeHugger Robot
efdad0fc18 Merge "Create prebuilt api modules in load hook not mutator" into rvc-dev am: fc5608ec80
Change-Id: Iae8feeff7d5b52dde71fcca93cdc767813e2e1ab
2020-04-09 23:15:09 +00:00
TreeHugger Robot
fc5608ec80 Merge "Create prebuilt api modules in load hook not mutator" into rvc-dev 2020-04-09 22:53:23 +00:00
Paul Duffin
47f6315f01 Create prebuilt api modules in load hook not mutator
An attempt to reference one of the prebuilt modules directly from an
Android.bp file highlighted a bug. The prebuilt_apis module used a
mutator to create filegroup and java_import modules for a set of api
versions. That mutator ran after the "prebuilts" mutator which handled
the renaming of prebuilt modules when the matching source module was
not present. That meant that the only way to reference the module was
by explicitly adding the prefix "prebuilt_".

This change fixed that bug by creating the modules in a load hook rather
that a mutator. This ensures that the prebuilt modules are present well
before the "prebuilts" mutator is run. Removing the mutator also removes
an unnecessary traversal of the whole dependency tree.

It also updated the documentation to explain that it creates
java_import modules as well as the filegroup modules.

Bug: 153649372
Test: m droid
Change-Id: Id44dce8ca9968ae903345df6ef1c4f1be9cb76c5
2020-04-09 21:35:53 +01:00
Julien Desprez
0eb91f4e91 Merge "Add support for order-only dependencies to RuleBuilder" into rvc-dev 2020-04-09 18:56:01 +00:00
Treehugger Robot
ccf72eeab7 Merge changes If74eea67,I9d8089b2 am: 522bca3b26 am: ec1c252f7b
Change-Id: Ie0ed2da22ca948ab0083a6c5bc52d366d3332423
2020-04-09 17:10:51 +00:00
Paul Duffin
ad649c4e07 Merge "Generate struct with field for each api scope" am: f9cb1204e1 am: d1053dd94a
Change-Id: I516f32f0dec514f8aba2492970e791ec52c5f90f
2020-04-09 17:10:45 +00:00
Treehugger Robot
522bca3b26 Merge changes If74eea67,I9d8089b2
* changes:
  Extract createJavaImportForStubs()
  Support java_sdk_library as member of sdk
2020-04-09 17:01:51 +00:00
Paul Duffin
f9cb1204e1 Merge "Generate struct with field for each api scope" 2020-04-09 17:01:40 +00:00
Anton Hansson
85c151c3f3 Create a framework.aidl for non-updatable platform
framework.aidl includes the parcelables from the non-updatable
part of the framework as well as the modules. This causes a
dependency cycle when building module stubs:
module_stub -> module_sdk -> framework.aidl -> public_sdk -> module_stub

The module_sdk only includes the the stubs for the non-updatable
part of the framework, so it should also only contain the non-updatable
parcelables. This change creates a framework_non_updatable.aidl with
those parcelables, and updates module_current to use that.

Bug: 144149403
Test: m
Test: m && diff out/soong/framework{,_non_updatable}.aidl
      (the diff contains just TestApi + module parcelables)
Change-Id: I224117a0ff695c22d4a4317a51a9b775ed73066b
2020-04-09 17:45:30 +01:00
Jaewoong Jung
9b38447d48 Merge "Collect JNI coverage data only for first target." 2020-04-09 16:42:34 +00:00
Paul Duffin
d8dd2cd8a3 Merge "Allow droidstubs to not generate any stubs" am: e03749b9ad am: 6931de02de
Change-Id: I5bdb5b98e4692d5aa9f66a599b9728b98a877ff3
2020-04-09 16:15:48 +00:00
Paul Duffin
e03749b9ad Merge "Allow droidstubs to not generate any stubs" 2020-04-09 15:42:07 +00:00
Jaewoong Jung
46984eeb58 Collect JNI coverage data only for first target.
Modules with compile_multilib property set to "both" cause builds to
fail due to duplicate Make recipes. Fix it by outputting reports only
for the first target for now.

(This is a cherry-pick change.)

Bug: 153461674
Test: Built cts with the coverage flags set.
Change-Id: Ibb8da6e9c112a857695cd7095a62c910cddfbb94
Merged-In: Ibb8da6e9c112a857695cd7095a62c910cddfbb94
2020-04-09 08:32:40 -07:00