Commit Graph

21531 Commits

Author SHA1 Message Date
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
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
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
TreeHugger Robot
6e8b5fc5fe [automerger skipped] Merge "Apply EnforceRROExemptedTargets in Soong" into rvc-dev am: c8e0a44e2b -s ours
am skip reason: Change-Id I309482b6ad439a7602127f68f2f7ffa856b9e192 with SHA-1 b9b1327c2d is in history

Change-Id: I505028d2484d5899d653a121d3036aa0e727a1b3
2020-04-23 01:47:28 +00:00
TreeHugger Robot
c8e0a44e2b Merge "Apply EnforceRROExemptedTargets in Soong" into rvc-dev 2020-04-23 01:25:49 +00:00
Oliver Nguyen
2047ff7750 [automerger skipped] Merge "Only package gcno files for gcov coverage builds." am: 0e8579b4f1 am: 0c881d1d4d -s ours
am skip reason: Change-Id I81598bcab8db105de6692156c001fc961409ce63 with SHA-1 6f641c1cac is in history

Change-Id: I6ffab5fc1bab633147ca420ee19ac3a9ee944fbd
2020-04-23 01:17:17 +00:00
Oliver Nguyen
0c881d1d4d Merge "Only package gcno files for gcov coverage builds." am: 0e8579b4f1
Change-Id: Ief3e76ac42d3e25340f29b12542ccc42d3ef59fd
2020-04-23 01:00:03 +00:00
Oliver Nguyen
0e8579b4f1 Merge "Only package gcno files for gcov coverage builds." 2020-04-23 00:45:51 +00:00
Oliver Nguyen
d7b2753408 Merge "Only package gcno files for gcov coverage builds." into rvc-dev am: b636300911
Change-Id: If62672b204091825eb728751df8babb980e7a1bd
2020-04-22 20:54:35 +00:00
Oliver Nguyen
0452678a40 Only package gcno files for gcov coverage builds.
Bug: 154550223
Test: m -j NATIVE_COVERAGE=true droid dist tests
Test: m -j CLANG_COVERAGE=true droid dist tests
Merged-In: I81598bcab8db105de6692156c001fc961409ce63
Change-Id: I81598bcab8db105de6692156c001fc961409ce63
2020-04-22 13:30:07 -07:00
Oliver Nguyen
b636300911 Merge "Only package gcno files for gcov coverage builds." into rvc-dev 2020-04-22 20:28:40 +00:00
Matthew Maurer
e972e8822b Update Android's rustc version 1.40.0->1.42.0
Test: cd external/rust/crates; mm
Bug: 152633654
Change-Id: Ic7cbc1869fdffa332033cecd4c4596775946d0e9
2020-04-22 13:22:25 -07: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
Inseob Kim
5cc2dea361 [automerger skipped] Add C++ Host support on sysprop_library am: eb59165dee -s ours
am skip reason: Change-Id I850d91fea298ef1a0c16c6a7a9ec1aca5cf37e69 with SHA-1 89db15dcab is in history

Change-Id: I57d61c6925539a69858972b11bbdf62abe101359
2020-04-22 13:40:56 +00:00
Paul Duffin
f6155721eb Extract createJavaImportForStubs()
Bug: 153443117
Bug: 153306490
Test: m nothing
Merged-In: If74eea675b7ab4aeaa821294f2a137c95f794d4f
Change-Id: If74eea675b7ab4aeaa821294f2a137c95f794d4f
2020-04-22 12:51:56 +01:00
Paul Duffin
6187162084 Support java_sdk_library as member of sdk
Bug: 153443117
Bug: 153306490
Test: m nothing
Merged-In: I9d8089b2555038e3f10ad5939a6a7b01839c67ea
Change-Id: I9d8089b2555038e3f10ad5939a6a7b01839c67ea
2020-04-22 12:51:55 +01:00
Paul Duffin
6a2bd115c5 Generate struct with field for each api scope
Makes it easier to add new api scopes by generating a struct with a
field for each scope.

Bug: 153443117
Bug: 153306490
Test: m nothing
Merged-In: Iec77a858d2c851d99e56568b89cb30aa3ff2a244
Change-Id: Iec77a858d2c851d99e56568b89cb30aa3ff2a244
2020-04-22 12:51:54 +01:00
Paul Duffin
455b0bf922 Allow droidstubs to not generate any stubs
Needed to optimize the handling of the module_lib API surface which
currently has to be generated with two separate droidstubs instances,
one to generate the stubs and another to generate the .txt file. This
allows the module generating the .txt file to avoid also wasting time
generating stubs that are not used.

This change:
* Adds a generate_stubs property that defaults to true to allow the
  behavior to be customized on a per module basis.
* Uses either the stubs srcjar or the api .txt file as the OutputFile
  for the AndroidMkEntries to ensure that they get written out properly.
* Rearranges the code for generating stubs to make it easier to
  turn it off.

Bug: 146727827
Bug: 153306490
Test: m droid
      Check output dir of framework-sdkextensions-api-module_libs_api
	  to make sure it does not contain any sources or srcjars.
Merged-In: Ib8025019f8a7a8cf5fa8765d76b5ad470af20006
Change-Id: Ib8025019f8a7a8cf5fa8765d76b5ad470af20006
2020-04-22 12:51:53 +01:00