Commit Graph

18223 Commits

Author SHA1 Message Date
Paul Duffin
ae7a02e2d7 Merge "Support header and implementation jars in sdk" am: 8cda6d93de am: d38afab757
am: 3f6417dad2

Change-Id: I1ed9a3a43384a800c30494665e755709da45f622
2019-12-07 02:10:22 -08:00
Paul Duffin
3f6417dad2 Merge "Support header and implementation jars in sdk" am: 8cda6d93de
am: d38afab757

Change-Id: I06d2cdaec4f8f3f828169f75afbf94002cf92f8b
2019-12-07 02:08:22 -08:00
Paul Duffin
d38afab757 Merge "Support header and implementation jars in sdk"
am: 8cda6d93de

Change-Id: I80c62596a72f0319d62eb4fe32e308db18589c9e
2019-12-07 02:06:21 -08:00
Treehugger Robot
8cda6d93de Merge "Support header and implementation jars in sdk" 2019-12-07 08:52:09 +00:00
Yi Kong
1b160e03ae [automerger skipped] Switch to clang-r353983c1. am: 438f8347e8 -s ours
am: f8f338d1cd

Change-Id: I0303fcf44fb271acec48a03f589981e946b47cac
2019-12-06 23:04:18 -08:00
Automerger Merge Worker
f8f338d1cd [automerger skipped] Switch to clang-r353983c1. am: 438f8347e8 -s ours
am skip reason: skipped by user yikong

Change-Id: I1ce52182edac9d3eedd69ef007980a0d0a7bc72c
2019-12-07 06:43:47 +00:00
Colin Cross
da0c37bb44 Merge "Move ImageMutator after archMutator" am: e2f3b5dfe5 am: a129b29c76
am: 2e8290cfc7

Change-Id: Id08e19ede38a0eaa1999a44f3e012e19913249f3
2019-12-06 16:50:32 -08:00
Colin Cross
2e8290cfc7 Merge "Move ImageMutator after archMutator" am: e2f3b5dfe5
am: a129b29c76

Change-Id: Ia9f65e3a66041486036c2a5bf9e585dae8f61502
2019-12-06 16:49:30 -08:00
Colin Cross
a129b29c76 Merge "Move ImageMutator after archMutator"
am: e2f3b5dfe5

Change-Id: Ibf2ef2e4b2f119b6bd04a54cf00ab2d099ce7627
2019-12-06 16:46:29 -08:00
Treehugger Robot
e2f3b5dfe5 Merge "Move ImageMutator after archMutator" 2019-12-07 00:37:30 +00:00
Jeff Sharkey
1b9119b8b8 Merge "Overridden APEX doesn't contribute to the file contexts" am: e2e4a5dd56 am: 76991e9429
am: a5ac8e73f6

Change-Id: I798bff59ed562fb43e64b11a84f9fdb39bc9ef3f
2019-12-06 15:13:44 -08:00
Jeff Sharkey
a5ac8e73f6 Merge "Overridden APEX doesn't contribute to the file contexts" am: e2e4a5dd56
am: 76991e9429

Change-Id: I2e0d2430ea74c2e5520ba125a553a037bc1ca947
2019-12-06 15:12:07 -08:00
Jeff Sharkey
76991e9429 Merge "Overridden APEX doesn't contribute to the file contexts"
am: e2e4a5dd56

Change-Id: If8a688b89f38aa22a0c31507331b1c910ba98779
2019-12-06 15:09:06 -08:00
Jeff Sharkey
e2e4a5dd56 Merge "Overridden APEX doesn't contribute to the file contexts" 2019-12-06 23:02:01 +00:00
Yi Kong
438f8347e8 Switch to clang-r353983c1.
Test: presubmit
Bug: 145023753
Bug: 145483858
Change-Id: I76850ac443d9da4dd2d1500219d0bb87f6d283d1
2019-12-06 14:52:50 -08:00
Elliott Hughes
fe50cc5ba8 Merge "Enable -Wpragma-pack warnings as errors." am: b5d11197d3 am: d06667fc1a
am: e4dd3eb114

Change-Id: I271e7892259010e3760e0080f6326c4cf2c38744
2019-12-06 14:27:27 -08:00
Elliott Hughes
e4dd3eb114 Merge "Enable -Wpragma-pack warnings as errors." am: b5d11197d3
am: d06667fc1a

Change-Id: I8554f3d8758265dd8e5e5423e0f68d3b32140e11
2019-12-06 14:23:26 -08:00
Elliott Hughes
d06667fc1a Merge "Enable -Wpragma-pack warnings as errors."
am: b5d11197d3

Change-Id: I4fa37cd5e85080646b1339e5ca014d396c2da9c0
2019-12-06 14:16:26 -08:00
Elliott Hughes
b5d11197d3 Merge "Enable -Wpragma-pack warnings as errors." 2019-12-06 22:07:20 +00:00
Colin Cross
ae6c5207cc Move ImageMutator after archMutator
Move the ImageMutator to be registered just after the archMutator
in preparation for moving it between osMutator and archMutator.
Requries updating variants in a few tests that now run the
ImageMutator.

Bug: 142286466
Test: no change to build.ninja
Test: all soong tests
Change-Id: Ia9d2a7bc0e225bedec3c9a83ea04f471a931bf47
2019-12-06 12:37:14 -08:00
Jeongik Cha
8b65575d87 Merge "Link type checking for java_library" am: f3c24c12ef am: eff8478327
am: b06fdee4b9

Change-Id: I81ceb8411e9252c05e76af23107c7f27d28714e4
2019-12-06 11:21:53 -08:00
Jeongik Cha
b06fdee4b9 Merge "Link type checking for java_library" am: f3c24c12ef
am: eff8478327

Change-Id: I677dcf5c75db8c2bb3fe845ab0969510fcf9fa9f
2019-12-06 11:17:56 -08:00
Jeongik Cha
eff8478327 Merge "Link type checking for java_library"
am: f3c24c12ef

Change-Id: I1630cf20beec882d5a6aec8189d56f6b1fe45c39
2019-12-06 11:13:54 -08:00
Treehugger Robot
f3c24c12ef Merge "Link type checking for java_library" 2019-12-06 18:59:48 +00:00
Dan Willemsen
674200cfee Merge "Add sharding support to multiproduct_kati" am: ad1997eebc am: a87aecec69
am: e8a8906cfe

Change-Id: I9f0746201a72614096d1f5f947ad74d8b997edab
2019-12-06 09:50:43 -08:00
Dan Willemsen
e8a8906cfe Merge "Add sharding support to multiproduct_kati" am: ad1997eebc
am: a87aecec69

Change-Id: Id23f47a63790eb8f912597f6b9f3f89df1c1755e
2019-12-06 09:48:42 -08:00
Dan Willemsen
a87aecec69 Merge "Add sharding support to multiproduct_kati"
am: ad1997eebc

Change-Id: Iedbf9bd8751dece3f62e88003b8e62a835d89279
2019-12-06 09:46:41 -08:00
Dan Willemsen
ad1997eebc Merge "Add sharding support to multiproduct_kati" 2019-12-06 17:40:23 +00:00
Ulyana Trafimovich
f21ca1ea2e Merge "Pass correct --image argument to oatdump." am: a4f02412a1 am: 4c1df60960
am: 5ab05089b4

Change-Id: I3ab9610fb42f46d47c708ab6718c7e1643613b90
2019-12-06 09:19:06 -08:00
Ulyana Trafimovich
5ab05089b4 Merge "Pass correct --image argument to oatdump." am: a4f02412a1
am: 4c1df60960

Change-Id: I764f6e9e9a522b36d6de75c130a653331461efd7
2019-12-06 09:15:02 -08:00
Ulyana Trafimovich
4c1df60960 Merge "Pass correct --image argument to oatdump."
am: a4f02412a1

Change-Id: I2a799616d99584105df7ba03ab1dbef3c4e6fcf7
2019-12-06 09:11:02 -08:00
Ulyana Trafimovich
a4f02412a1 Merge "Pass correct --image argument to oatdump." 2019-12-06 16:55:39 +00:00
Paul Duffin
9890d1316b Separate out module type specific test config am: d835daaade am: cef37ba4ee
am: 2a60ae81bc

Change-Id: I19bca9a4d7314d6ba1cb5b93fbfae157fb0862ae
2019-12-06 08:51:18 -08:00
Paul Duffin
2a60ae81bc Separate out module type specific test config am: d835daaade
am: cef37ba4ee

Change-Id: I73fd07f4569ab8e2d76c2dd044ec65d8955d203f
2019-12-06 08:49:18 -08:00
Paul Duffin
cef37ba4ee Separate out module type specific test config
am: d835daaade

Change-Id: I7d80cfcedf4e31fc584c4af16ac4835c01f1ca3f
2019-12-06 08:47:17 -08:00
Paul Duffin
a0dbf43a82 Support header and implementation jars in sdk
Add a new java_header_libs property that exports header jars (as
java_libs currently does) and switch java_libs to export implementation
jars instead.

Refactors implementation of the existing library sdk member type so
both properties can be supported from common code as they differ only
on the jar being exported.

Bug: 143678475
Test: m nothing
Change-Id: I04642122f72d083bbdfd3290624f957b71ee8875
2019-12-06 16:13:58 +00:00
Paul Duffin
d835daaade Separate out module type specific test config
Bug: 143678475
Test: m conscrypt-module-sdk
Change-Id: I71433a7c89dfae4c27537f1f66bd677cf9fba0b3
2019-12-06 16:13:58 +00:00
Paul Duffin
6e2ab7db45 Merge changes Ia7dbcd41,I93140450,I4d3fe18f,Ib00870dd,I10203594 am: 3a7caaa80c am: f44ca6b363
am: 4fe2c14a9b

Change-Id: Ib4d1eef9e11c7c10f4912fc446b538ddd229c6dd
2019-12-06 08:03:25 -08:00
Paul Duffin
4fe2c14a9b Merge changes Ia7dbcd41,I93140450,I4d3fe18f,Ib00870dd,I10203594 am: 3a7caaa80c
am: f44ca6b363

Change-Id: Ieed3aa6bedfdec3eaab4d2f2e8f21d7c6b0577f8
2019-12-06 08:01:25 -08:00
Paul Duffin
e46a9d5d70 Merge "Use static build rules in snapshot generation" am: 7467a714b0 am: eeaa413714
am: 4ce6f5b667

Change-Id: I315bb11232bbce845aed93c902ad985c6e70e44b
2019-12-06 08:01:24 -08:00
Paul Duffin
4ce6f5b667 Merge "Use static build rules in snapshot generation" am: 7467a714b0
am: eeaa413714

Change-Id: I54141d3740d8d5f3a2d2246f3bb2f8278497023f
2019-12-06 07:59:39 -08:00
Paul Duffin
f44ca6b363 Merge changes Ia7dbcd41,I93140450,I4d3fe18f,Ib00870dd,I10203594
am: 3a7caaa80c

Change-Id: Ib0ee79a0bc6d6cc15e9fe8620d4d2461f18b2779
2019-12-06 07:58:05 -08:00
Paul Duffin
eeaa413714 Merge "Use static build rules in snapshot generation"
am: 7467a714b0

Change-Id: I2ee0d433e3ac586103c931295fea5d807156617f
2019-12-06 07:57:39 -08:00
Treehugger Robot
3a7caaa80c Merge changes Ia7dbcd41,I93140450,I4d3fe18f,Ib00870dd,I10203594
* changes:
  Organize sdk member properties
  Extract the cc and java sdk related tests out into their own file
  Improve testing of sdk snapshot generation
  Separate sdk testing infrastructure from sdk tests
  Parameterize the sdk member processing
2019-12-06 15:55:24 +00:00
Paul Duffin
7467a714b0 Merge "Use static build rules in snapshot generation" 2019-12-06 15:52:00 +00:00
Jeongik Cha
e403e9e8dc Link type checking for java_library
Link type checking for java_library has not been working unintentionally.
So turn on link type checking for these types.

And also add tests for link type checking.

Bug: 145799020
Test: cherry-pick aosp/1182522 and check if build fails
Test: m nothing and there is no error(soong unittest)

Change-Id: Ifc347f657885de1028ac0076ddd103c0387b597a
2019-12-07 00:45:02 +09:00
Anton Hansson
e2856b08de [automerger skipped] Revert "Move odexes of non-system apps into system_other" am: d57bd3c84f am: 1297ecfea6
am: b44f66a9fc -s ours
am skip reason: change_id Iefd882ec11c060877671f5bf0f2429ba4d811f8b with SHA1 25e7cf095b is in history

Change-Id: Idafb9e4ab0611b991b72b2107b4206f22993bc63
2019-12-06 07:30:58 -08:00
Anton Hansson
b44f66a9fc Revert "Move odexes of non-system apps into system_other" am: d57bd3c84f
am: 1297ecfea6

Change-Id: Iae32520482ba92e564b06aecbfd9acc773e374dd
2019-12-06 07:28:57 -08:00
Anton Hansson
1297ecfea6 Revert "Move odexes of non-system apps into system_other"
am: d57bd3c84f

Change-Id: I9f319c484164e0636db08b0afd36e9bdf834244e
2019-12-06 07:27:01 -08:00
Anton Hansson
d57bd3c84f Revert "Move odexes of non-system apps into system_other"
This reverts commit 12b8d427c7.

Bug: 142537657
Test: No
Change-Id: Iefd882ec11c060877671f5bf0f2429ba4d811f8b
Merged-In: Iefd882ec11c060877671f5bf0f2429ba4d811f8b
2019-12-06 13:42:25 +00:00