Commit Graph

21547 Commits

Author SHA1 Message Date
Treehugger Robot
d56e7191cb Merge "Repeat kapt processor argument for multiple processors" am: 52c0b7b35b am: 7b00b62a89
Change-Id: Ia32530eac2ca4ce475a8f1f9a0f41674dba2fa67
2020-04-24 16:14:51 +00:00
Ivan Lozano
d43697bc70 Merge "Clean up rust tests." am: dc455395ee am: fffbd97afa
Change-Id: I38202982e963045a9c9f41fbaf91d833e2303c14
2020-04-24 16:14:22 +00:00
Treehugger Robot
7b00b62a89 Merge "Repeat kapt processor argument for multiple processors" am: 52c0b7b35b
Change-Id: Ifb56e6cac2dd38c96be1ed3e0153258301469d51
2020-04-24 16:01:16 +00:00
Ivan Lozano
fffbd97afa Merge "Clean up rust tests." am: dc455395ee
Change-Id: I117a9497e9be9d12ec8b46a829867d5b92bc62f8
2020-04-24 16:00:52 +00:00
Treehugger Robot
52c0b7b35b Merge "Repeat kapt processor argument for multiple processors" 2020-04-24 15:51:13 +00:00
Ivan Lozano
dc455395ee Merge "Clean up rust tests." 2020-04-24 15:43:22 +00:00
Treehugger Robot
571bb52259 Merge "android_app_import is now ApexModule" am: 65c1d14cfa am: 2b4f7797d9
Change-Id: If2ed96cdf6c15bbfdc0619a478303a0836b55e0f
2020-04-24 12:41:32 +00:00
Treehugger Robot
2b4f7797d9 Merge "android_app_import is now ApexModule" am: 65c1d14cfa
Change-Id: Idcae9037bed05e59cdc52f7af41dd1ccd6ac13a1
2020-04-24 12:25:58 +00:00
Treehugger Robot
65c1d14cfa Merge "android_app_import is now ApexModule" 2020-04-24 12:12:23 +00:00
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
0f4722751b Merge "Add "updatable" property to ApexModule interface." am: dc9510537a
Change-Id: Ic4397e6cce28ecc7630ea7a7f974491118734000
2020-04-24 08:47:11 +00:00
Ulyana Trafimovich
dc9510537a Merge "Add "updatable" property to ApexModule interface." 2020-04-24 08:25:34 +00:00
Treehugger Robot
fd6b26abc1 Merge "Remove libopus from apex_available whitelist" am: f4dc25b476 am: a1c10cf43c
Change-Id: I15695035a45c934faec13384fef7bb8ad08d17ca
2020-04-24 01:07:26 +00:00
Treehugger Robot
a1c10cf43c Merge "Remove libopus from apex_available whitelist" am: f4dc25b476
Change-Id: Ie099800f219f2325cb9b0441c07d7b1d0154d5c7
2020-04-24 00:50:37 +00:00
Treehugger Robot
f4dc25b476 Merge "Remove libopus from apex_available whitelist" 2020-04-24 00:33:59 +00:00
Nicolas Geoffray
44afbfe6ea Merge "Add conscrypt-module-host-exports to the list." am: e4a4b6ac43 am: ab70364c04
Change-Id: Iceeeb76c0646fc82c70231e94aedcd69e6156450
2020-04-23 18:30:38 +00:00
Nicolas Geoffray
ab70364c04 Merge "Add conscrypt-module-host-exports to the list." am: e4a4b6ac43
Change-Id: I4dbe9247b8159a01bfad0bd4d2e59cbf96ad806c
2020-04-23 18:11:45 +00:00
Nicolas Geoffray
e4a4b6ac43 Merge "Add conscrypt-module-host-exports to the list." 2020-04-23 17:57:18 +00:00
Matthew Maurer
aa2f743d93 Merge "Update Android's rustc version 1.40.0->1.42.0" am: 1f434b26c1 am: 2871fc0c2c
Change-Id: I4e69f6b718ec0525522ef4f105406bf8d8ee9ecf
2020-04-23 17:30:06 +00:00
Matthew Maurer
2871fc0c2c Merge "Update Android's rustc version 1.40.0->1.42.0" am: 1f434b26c1
Change-Id: Ifb01144fe9908649ce0b22e2398419336453aaf2
2020-04-23 17:07:53 +00:00
Matthew Maurer
1f434b26c1 Merge "Update Android's rustc version 1.40.0->1.42.0" 2020-04-23 16:53:41 +00:00
TreeHugger Robot
dbc8cf7772 [automerger skipped] Merge "Extract createJavaImportForStubs()" into rvc-dev am: 0b848b01e8 -s ours
am skip reason: Change-Id If74eea675b7ab4aeaa821294f2a137c95f794d4f with SHA-1 bbb546b2da is in history

Change-Id: Ib10cf88addb369538445a87f09f96bc88ec9f4b2
2020-04-23 15:49:26 +00:00
TreeHugger Robot
b25ea53f83 [automerger skipped] Merge "Support java_sdk_library as member of sdk" into rvc-dev am: 317bf11585 -s ours
am skip reason: Change-Id I9d8089b2555038e3f10ad5939a6a7b01839c67ea with SHA-1 dd46f71493 is in history

Change-Id: Iecb6a59986590f767ee3461025e919caefbc7f28
2020-04-23 15:49:20 +00:00
TreeHugger Robot
0bf42a79e7 [automerger skipped] Merge "Generate struct with field for each api scope" into rvc-dev am: 17b6f24b1e -s ours
am skip reason: Change-Id Iec77a858d2c851d99e56568b89cb30aa3ff2a244 with SHA-1 46a26a8871 is in history

Change-Id: I7b5ea3ba6a220cf2305028a6370e65c4eeb4118c
2020-04-23 15:49:14 +00:00
TreeHugger Robot
3c5b426cc0 [automerger skipped] Merge changes Ib8025019,I7d58d104,I9dd4312c,I995ed389,Iba2a8a5a, ... into rvc-dev am: 416b811742 -s ours
am skip reason: Change-Id Ib8025019f8a7a8cf5fa8765d76b5ad470af20006 with SHA-1 3ae2951296 is in history

Change-Id: Ie8fa0e9234163c9d63d7eb565d279e88d6f8670a
2020-04-23 15:49:09 +00:00
TreeHugger Robot
03914d9768 [automerger skipped] Merge "Parameterize scopes with additional droidstubs args" into rvc-dev am: 1b846d6a08 -s ours
am skip reason: Change-Id I96f0eb033d44c6a74787ba7f1523799b05a58092 with SHA-1 1fb487df17 is in history

Change-Id: Ie328ba64b17b932e38809997d1416eac75ec4c91
2020-04-23 15:49:02 +00:00
TreeHugger Robot
b24e30298b [automerger skipped] Merge changes Ie883eb45,If46a2f74,I8f4c5395,Ic4eb169d,I2b2408ef, ... into rvc-dev am: 4586da2aae -s ours
am skip reason: Change-Id Ie883eb4590f9c091d4149d7b17d7d3d91b1b5c6a with SHA-1 6d0886e279 is in history

Change-Id: Ia0b81becd50642a57934489d58c6419ea7e4fd58
2020-04-23 15:48:57 +00:00
TreeHugger Robot
3fa225465b [automerger skipped] Merge changes Idd50ed38,Icbc86b21,I62d016d9 into rvc-dev am: 2166c1c1ee -s ours
am skip reason: Change-Id Idd50ed38bc90d1d93551f78e6310f167941487d9 with SHA-1 f5ea9e1f76 is in history

Change-Id: I38c266fb70b748fd65e2bbeb8cca24cd36c1af3e
2020-04-23 15:48:50 +00:00
TreeHugger Robot
0b848b01e8 Merge "Extract createJavaImportForStubs()" into rvc-dev 2020-04-23 15:20:03 +00:00
TreeHugger Robot
317bf11585 Merge "Support java_sdk_library as member of sdk" into rvc-dev 2020-04-23 15:20:00 +00:00
TreeHugger Robot
17b6f24b1e Merge "Generate struct with field for each api scope" into rvc-dev 2020-04-23 15:19:56 +00:00
TreeHugger Robot
416b811742 Merge changes Ib8025019,I7d58d104,I9dd4312c,I995ed389,Iba2a8a5a, ... into rvc-dev
* changes:
  Allow droidstubs to not generate any stubs
  Remove conscrypt.module.intra.core.api.stubs from apex white list
  Ignore PrebuiltDepTag when processing APEX contents
  Stop requiring apex_available on java_library members of sdks
  Add dependency tags to apex available errors
  Extract DepIsInSameApex and RequiredSdks interfaces
2020-04-23 15:19:41 +00:00
TreeHugger Robot
1b846d6a08 Merge "Parameterize scopes with additional droidstubs args" into rvc-dev 2020-04-23 15:19:36 +00:00
TreeHugger Robot
4586da2aae Merge changes Ie883eb45,If46a2f74,I8f4c5395,Ic4eb169d,I2b2408ef, ... into rvc-dev
* changes:
  Replace references to droiddoc with droidstubs
  Allow walkPayloadDeps visitor to control walk flow
  Add apex_available to sysprop_library
  Improve missing apex_available message
  Split TestApexAvailable into separate tests
  Use reflect.Zero(type) to get value to clear field
  Sdk snapshot set compile_multilib per OsType
  Remove old SdkMemberType API for creating snapshot modules
  Improve consistency of handling java snapshot properties
  Make new module creation API more flexible
  Add abstraction for tracking compile multilib usages
  Add support for using cc_library in sdk/module_exports
  Extract the osTypeSpecificInfo code from module creation loop
  Extract archTypeSpecificInfo code from module creation loop
  Clean up the main module creation loop
  Add support for cc_prebuilt_library
  Refactor prebuilt to use srcs supplier function
  Output properties before sets in snapshot module
  Remove SdkMemberType.FinalizeModule
  Follow up a review comment that was missed
  Copy shared_libs and system_shared_libs to module snapshot
  Support extracting common values from embedded structures
  Refactor common value extraction
  Copy white listed apex available settings into snapshot
  Disable installation for sdk snapshot versioned prebuilts
  Remove special handling of test_ apexes
  Remove special handling of com.android.art.debug/release
  Allow sdk members to vary by os type
  Add support for multiple os types
  Copy sdk_version to cc library snapshots
  Refactor java_library/java_test snapshot processing
  Refactor snapshot module creation
  Enable androidmk processing in sdk testing
  Add a nice install paths for module SDKs and exports.
  Copy apex_available properties to snapshot modules
  Improve documentation of CompileMultiTargets and related properties
  Only check copy rules into the snapshot directory
  Simplify java library sdk member code
  Add CommonOS variant for sdk
  Fix bug in error reporting when adding duplicate properties
  Avoid invoking sdk member to add empty list of dependencies
  Add windows to the list of available OS's in sdk tests
  Add support for cc_library_headers in sdk/module_exports
  Prune any empty property sets from the modules before transforming
  Simplify cc library sdk snapshot handling of include dirs/headers
  Add support for transforming a property set after its contents
  Fix issues with bp transformation
2020-04-23 15:19:26 +00:00
TreeHugger Robot
2166c1c1ee Merge changes Idd50ed38,Icbc86b21,I62d016d9 into rvc-dev
* changes:
  Add cc_prebuilt_library_headers
  Separate cc_library_headers to its own file and add tests
  Allow compile_multilib to be specified on module exports
2020-04-23 15:18:31 +00:00
Ivan Lozano
2f15bae336 Clean up rust tests.
The list of required deps for testing is a lot shorter as we no longer
include as many prebuilt libraries and our list of stdlibs is much
shorter. Remove the libraries we no longer need, and add the
non-prebuilt libstd and libtest to the deps generated for every test.

Bug: 153463188
Test: Soong tests pass.
Change-Id: I94f7b514797ab8d6aedb543ea6afdb07611b7293
2020-04-23 09:39:34 -04: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
c107e4bb9b [automerger skipped] Merge "Remove unused arguments in droiddoc" am: 14f42d34af am: bd6dbb3b56 -s ours
am skip reason: Change-Id Ib2630d4d49f21003b17e2331b0900e8df0a27e66 with SHA-1 0ee713aa0e is in history

Change-Id: Ic39b6258c3b94e9d902df516630141e2984a2120
2020-04-23 10:47:25 +00:00
Anton Hansson
bd6dbb3b56 Merge "Remove unused arguments in droiddoc" am: 14f42d34af
Change-Id: Ieab243dbb9f3c49f2df46bbf292c9e762b704180
2020-04-23 10:16:25 +00:00
Jiyong Park
592a6a41de android_app_import is now ApexModule
Like other prebuilts (java_import, etc.), android_app_import has now
became ApexModule. It means it supports APEX-specific properties like
apex_available, min_sdk_version, etc.

Bug: 154488897
Test: m
Change-Id: I86f02771496ffc68c98a50ddfc786788fa1e05fb
2020-04-23 19:02:04 +09: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
7aa5899e56 Merge "Remove unused arguments in droiddoc" into rvc-dev 2020-04-23 09:36:35 +00:00
Nicolas Geoffray
0a2e297206 Add conscrypt-module-host-exports to the list.
Test: build-mainline-modules.sh
Change-Id: I9ca14cc37a69b1172f52412297977dd03c6ca1a0
2020-04-23 09:35:45 +01:00
Jooyung Han
47db5adb06 Remove libopus from apex_available whitelist
libopus sets its own apex_available property.

Bug: 150999716
Test: m
Change-Id: I4cff3ebb7e017a1fb629b18b72238acf3df0d26e
2020-04-23 15:54:23 +09:00
Jooyung Han
28aa6ff930 [automerger skipped] Merge "Skip version mutator for host/ramdisk/recovery" am: 79519b6caf am: a1181069b0 -s ours
am skip reason: Change-Id Id576c4318d9d69246a4a7e2fb4145d5fd2ab9416 with SHA-1 c40b5193fe is in history

Change-Id: I8835a604b0f103b22546b1047aafc7ab6b102fca
2020-04-23 04:23:39 +00:00
Jooyung Han
a1181069b0 Merge "Skip version mutator for host/ramdisk/recovery" am: 79519b6caf
Change-Id: Icd074f9808aa765bd4ebad522a4135dc5fe1914f
2020-04-23 04:01:26 +00:00
Jooyung Han
79519b6caf Merge "Skip version mutator for host/ramdisk/recovery" 2020-04-23 03:46:30 +00:00
Jooyung Han
624d35cb4d Skip version mutator for host/ramdisk/recovery
"version" mutator creates stubs variants for "cc" libraries with
"stubs.versions". These stubs are for APEX-APEX or APEX-Platform
boundaries.

For host/ramdisk/recovery variants, stubs are not necessary.

Exempt-From-Owner-Approval: cp from internal

Bug: 153698496
Test: m
Merged-In: Id576c4318d9d69246a4a7e2fb4145d5fd2ab9416
Change-Id: Id576c4318d9d69246a4a7e2fb4145d5fd2ab9416
(cherry picked from commit c40b5193fe)
2020-04-23 03:46:09 +00:00
Colin Cross
5a11686e64 Repeat kapt processor argument for multiple processors
kapt claims to support a comma separated list of annotation
processors, but it errors if multiple annotation processors
are given.  Surrounding the the list with {} does not error,
but it also doesn't even warn if the second element in the
list is garbage, so it may not be running the second
processor.  Repeat the processor argument for each
annotation processor class instead.

Bug: 154736649
Test: TestKapt
Test: m checkbuild
Change-Id: I4c7c161dbf867d7fba1aaf16fd5e502647e3f682
2020-04-22 20:43:37 -07:00