Oliver Nguyen
f3906b64f6
Merge "Package coverage files as a zip." am: 7268fd494d
...
am: 85cefe661b
Change-Id: I9937d797b9447e921c56dbf8c3b01c05f0514648
2019-06-11 19:28:00 -07:00
Oliver Nguyen
85cefe661b
Merge "Package coverage files as a zip."
...
am: 7268fd494d
Change-Id: Iac5315b45fa03a0b0c2d4abeb33f21bf93aa374a
2019-06-11 19:21:57 -07:00
Treehugger Robot
7268fd494d
Merge "Package coverage files as a zip."
2019-06-12 02:00:01 +00:00
Oliver Nguyen
c743414d42
Package coverage files as a zip.
...
Test: make NATIVE_COVERAGE=true COVERAGE_PATHS="*"
Change-Id: I955212a20ea19c854ebc88635252a1d174ea8f7f
2019-06-11 16:04:11 -07:00
Elliott Hughes
cf477a0cc1
Merge "Switch to toybox date." am: 633352f03f
...
am: e37424dc51
Change-Id: Ia05a0300ad41c26a8a1c27ea68f95d7652f4f9d2
2019-06-11 14:32:42 -07:00
Elliott Hughes
e37424dc51
Merge "Switch to toybox date."
...
am: 633352f03f
Change-Id: Ic25d65226a1651b20cac835a0134a39975970137
2019-06-11 14:26:43 -07:00
Elliott Hughes
633352f03f
Merge "Switch to toybox date."
2019-06-11 20:49:52 +00:00
Elliott Hughes
bc31b9190a
Switch to toybox date.
...
Test: treehugger
Change-Id: I558870092c29946419b9e15c33a6ee8ee7c6088f
2019-06-11 10:09:08 -07:00
Roland Levillain
bcb2d44966
Merge "Have `symlink_preferred_arch: true` honor the `stem` property." am: d7607c1c99
...
am: 299abf19c3
Change-Id: If982b553818062f476298027f0ae19b9e6699a06
2019-06-11 07:01:03 -07:00
Roland Levillain
299abf19c3
Merge "Have `symlink_preferred_arch: true` honor the `stem` property."
...
am: d7607c1c99
Change-Id: I741c846028da53facf11ae5a73cb36c4f650109b
2019-06-11 06:56:02 -07:00
Roland Levillain
d7607c1c99
Merge "Have `symlink_preferred_arch: true` honor the `stem` property."
2019-06-11 13:45:25 +00:00
Pete Gillin
dac578df15
Merge "Don't specify -encoding twice in Jdiff javadoc invocations." am: a53ae43180
...
am: 071d0d6799
Change-Id: Idb949aba99ca1aaae7bd10bb713b43d2d0669777
2019-06-11 04:36:42 -07:00
Pete Gillin
071d0d6799
Merge "Don't specify -encoding twice in Jdiff javadoc invocations."
...
am: a53ae43180
Change-Id: I6bda6b1b57cc7b08141cb9adb2d6cdb48012f872
2019-06-11 04:31:41 -07:00
Pete Gillin
a53ae43180
Merge "Don't specify -encoding twice in Jdiff javadoc invocations."
2019-06-11 11:21:37 +00:00
Roland Levillain
269d38047d
[automerger skipped] Allow arch-specific `symlink_preferred_arch` properties.
...
am: 0dbeb666bc
-s ours
am skip reason: change_id Ia6e62156adda2b3a51220552bbe4dab738753674 with SHA1 d9bf9be007
is in history
Change-Id: Ibafc1b7d7a3e69c57b8f14944f1bc83deb0749f9
2019-06-11 03:32:58 -07:00
Inseob Kim
434e298b5d
Merge "Separate exported includes out of flags" am: b879fb6b4b
...
am: 6011640688
Change-Id: I2128da11b37b5a378cfb64039968cd9695a34ec3
2019-06-10 22:12:21 -07:00
Inseob Kim
6011640688
Merge "Separate exported includes out of flags"
...
am: b879fb6b4b
Change-Id: Id66ff859751816eae1c97ec247bbffe057cc2e86
2019-06-10 22:07:20 -07:00
Treehugger Robot
b879fb6b4b
Merge "Separate exported includes out of flags"
2019-06-11 04:57:47 +00:00
Dan Willemsen
7488174f2c
Merge "Refactor .aar resource compilation" am: 588857b418
...
am: 2758050dc4
Change-Id: I98dfbdbef71972a040fd53f9e77eb321fb6f5e0e
2019-06-10 21:16:55 -07:00
Dan Willemsen
f8bd602f3f
Merge "Add dependency to version script when linking stub libraries" am: d1fcc4a93d
...
am: 2cb02169d4
Change-Id: Icb497c8eb70c22bc5ff8c4b402d2277756c5078c
2019-06-10 21:16:11 -07:00
Dan Willemsen
2758050dc4
Merge "Refactor .aar resource compilation"
...
am: 588857b418
Change-Id: I85532e6de6a8514e64c4304df711856584c2caef
2019-06-10 21:11:54 -07:00
Dan Willemsen
2cb02169d4
Merge "Add dependency to version script when linking stub libraries"
...
am: d1fcc4a93d
Change-Id: I3b9010ddaa6ff810d883ad7cffbc56cb513546dc
2019-06-10 21:11:11 -07:00
Treehugger Robot
588857b418
Merge "Refactor .aar resource compilation"
2019-06-11 04:03:51 +00:00
Treehugger Robot
d1fcc4a93d
Merge "Add dependency to version script when linking stub libraries"
2019-06-11 03:59:42 +00:00
Josh Gao
8563a453d6
Merge "Revert "Revert "Revert "Revert "Enable lld for windows""""" am: a1738e2c00
...
am: 1697e781bb
Change-Id: I6ceaffde7b71606ca5a6d086502fcc6e52e24266
2019-06-10 19:00:22 -07:00
Josh Gao
1697e781bb
Merge "Revert "Revert "Revert "Revert "Enable lld for windows"""""
...
am: a1738e2c00
Change-Id: I4d2b7446b8bbb02938f5bf56c4c8a627d8afad9b
2019-06-10 18:56:23 -07:00
Inseob Kim
7c8b645347
Merge "Fix sysprop_library build err when using filegroup" am: 4b0cc8c3c5
...
am: 6364f4732a
Change-Id: Ibb1c9b593efe79d6de25ee828bfde9510fc8f9cb
2019-06-10 18:49:19 -07:00
Josh Gao
a1738e2c00
Merge "Revert "Revert "Revert "Revert "Enable lld for windows"""""
2019-06-11 01:43:42 +00:00
Inseob Kim
6364f4732a
Merge "Fix sysprop_library build err when using filegroup"
...
am: 4b0cc8c3c5
Change-Id: I231370f6e2925a2fa8cf6b17106779300d85a095
2019-06-10 18:43:41 -07:00
Inseob Kim
6937844c29
Separate exported includes out of flags
...
Exported includes have been maintained along with other C/C++ flags.
This makes dependencies unclear, and users have had to parse flags to
get exported directories. This separates exported includes and
exported flags, thus making data more structured and explicit.
Bug: 132818174
Test: m
Change-Id: I5c25ac2224988c4a67e4db6fd6e4d39090b74041
2019-06-11 10:37:56 +09:00
Treehugger Robot
4b0cc8c3c5
Merge "Fix sysprop_library build err when using filegroup"
2019-06-11 01:21:44 +00:00
Dan Willemsen
939408aa22
Add dependency to version script when linking stub libraries
...
This isn't an effective issue with local builds currently, since the
version script is generated from the same rule as the sources used to
compile the objects that are also used in the link command. But if we
ever separated those paths or adopted restat, we could miss this
dependency.
This is also required for my RBE build to actually expose this file to
the link step.
Test: treehugger
Change-Id: I32bbb18cf7edddc88759d4f445d081868f3e9b44
2019-06-10 18:02:25 -07:00
Josh Gao
75a50a2c15
Revert "Revert "Revert "Revert "Enable lld for windows""""
...
This reverts commit b20200b3f5
.
Bug: http://b/110800681
Test: manual
Change-Id: Id3eb45ed29f3977fef3da241ec2c43755116d60c
2019-06-10 12:59:11 -07:00
Inseob Kim
9b36280d08
Merge "Clean up sortedKeys function" am: b6fd6f75f2
...
am: a0ea84a72c
Change-Id: I168d2021a29a4f6e5e46ceec964999cc07677fa7
2019-06-10 12:24:16 -07:00
Inseob Kim
a0ea84a72c
Merge "Clean up sortedKeys function"
...
am: b6fd6f75f2
Change-Id: I4461b1ce3b82cac45682ed8bdc9bf1cee4ed7419
2019-06-10 12:19:15 -07:00
Treehugger Robot
b6fd6f75f2
Merge "Clean up sortedKeys function"
2019-06-10 19:16:14 +00:00
Colin Cross
abcb92804f
Merge "Revert "Consolidate *MutatorContext and ModuleContext into BaseModuleContext"" am: 90ef4b9c12
...
am: 437679ddd1
Change-Id: Ie2ca6bc1c4df204333baaa3ba0d69c0db7842bc7
2019-06-10 11:18:00 -07:00
Colin Cross
437679ddd1
Merge "Revert "Consolidate *MutatorContext and ModuleContext into BaseModuleContext""
...
am: 90ef4b9c12
Change-Id: Icc67a56bbb690b626ec1685cb5bca1e1d6e166e2
2019-06-10 11:13:00 -07:00
Colin Cross
90ef4b9c12
Merge "Revert "Consolidate *MutatorContext and ModuleContext into BaseModuleContext""
2019-06-10 17:58:10 +00:00
Colin Cross
380c69aab4
Revert "Consolidate *MutatorContext and ModuleContext into BaseModuleContext"
...
This reverts commit 7e0a2cb590
.
Reason for revert: broke TARGET_BUILD_APPS builds
Change-Id: I5316a62f77bb38f6195e3df5e31b073dbd1eb682
2019-06-10 17:49:58 +00:00
Colin Cross
9d5d72f7a6
Merge changes I9f8df94f,I2d7f5c56,I0ebb7381,Ieefcfc1a am: a6bf56d4be
...
am: 236ac108f5
Change-Id: Ia0777130add15aceb17739f5dcb613ca4e1bf172
2019-06-10 10:00:33 -07:00
Colin Cross
236ac108f5
Merge changes I9f8df94f,I2d7f5c56,I0ebb7381,Ieefcfc1a
...
am: a6bf56d4be
Change-Id: Ic3033d9aa2fc325b1dc92bcd71cd24297e5bd69a
2019-06-10 09:55:39 -07:00
Colin Cross
a6bf56d4be
Merge changes I9f8df94f,I2d7f5c56,I0ebb7381,Ieefcfc1a
...
* changes:
Consolidate *MutatorContext and ModuleContext into BaseModuleContext
Consolidate baseContext, BaseContext, and BaseModuleContext
Rename ModuleBase receivers
Remove repetition in android package names
2019-06-10 16:38:11 +00:00
Inseob Kim
da63a49338
Fix sysprop_library build err when using filegroup
...
.sysprop files are intended to be used only with sysprop_library, and we
can prevent build error by specifying dependencies upon CreateModule.
Bug: 131708148
Test: 1) try building sysprop_library module.
Test: 2) see liblog is correctly linked.
Change-Id: I702cedc255ee0b6a30c15e474dd6a88d9607b145
2019-06-10 14:18:13 +00:00
Roland Levillain
9efb8c773f
Have `symlink_preferred_arch: true` honor the `stem` property.
...
If a module defines a `stem` property, use it to name the symlink
created for `symlink_preferred_arch: true` (instead of the module's
name).
Also always require suffixes when using `symlink_preferred_arch: true`.
Test: m
Change-Id: Ia8a56f94d21599194797ef8b259f5f03e08cb16a
2019-06-10 15:03:44 +01:00
Pete Gillin
2b1ea2edb3
Don't specify -encoding twice in Jdiff javadoc invocations.
...
The option '-encoding UTF-8' is included in the opts defined at L1754,
which are passed to transformJdiff (defined at L1594), and from there
to a javadoc rule (defined at L29), where they are included in a
command line string which already has '-encoding UTF-8' in it. The
result is that this appears twice in the command line. This is
apparently ignored by the version of javadoc currently used. Later
upstream versions of javadoc, however, fail with the error 'javadoc:
error - The -encoding option may be specified no more than once.'
Test: make system-api-stubs-docs
Test: make system-api-stubs-docs, using an OpenJDK 11 toolchain via OVERRIDE_ANDROID_JAVA_HOME
Bug: 131683177
Change-Id: Ib9382ada3c8259edfacb2be3ab14d4c09d8753a7
2019-06-10 14:37:41 +01:00
Inseob Kim
1a365c6a7f
Clean up sortedKeys function
...
This introduces a generic function SortedStringKeys which can be used to
get a slice of sorted string keys for all kinds of maps having string
keys.
Bug: N/A
Test: m
Change-Id: I542194c68984d909b7ad1dbf060d4d3a98f0ef23
2019-06-08 16:10:38 +09:00
Lokesh Gidra
6213e17eab
Revert "Switch to toybox timeout." am: 50e91c1a7a
...
am: dd5db326e2
Change-Id: I2dd48e28d8bf692479ec1aac925a0442485fa69b
2019-06-07 18:54:23 -07:00
Lokesh Gidra
dd5db326e2
Revert "Switch to toybox timeout."
...
am: 50e91c1a7a
Change-Id: Ic6ce302f68719613c244f67f92641fc34e04f79d
2019-06-07 18:48:18 -07:00
Lokesh Gidra
50e91c1a7a
Revert "Switch to toybox timeout."
...
This reverts commit e9f471635f
.
Reason for revert: Multiple art-test failures
Change-Id: I550864c23485a438889ab73c7e4a877cd730cabb
2019-06-08 00:46:09 +00:00