Jaewoong Jung
a4d59ff0b5
Optionally embed NOTICE files in apks. am: 5b425e2e20
...
am: 5d48965fed
2019-06-25 10:03:31 -07:00
Jaewoong Jung
5d48965fed
Optionally embed NOTICE files in apks.
...
am: 5b425e2e20
2019-06-25 09:59:31 -07:00
Elliott Hughes
788b2784c5
Merge "Revert "Switch to toybox tar."" am: ba9a51979d
...
am: 79c3096fb4
2019-06-24 22:39:17 -07:00
Elliott Hughes
79c3096fb4
Merge "Revert "Switch to toybox tar.""
...
am: ba9a51979d
2019-06-24 22:33:14 -07:00
Treehugger Robot
ba9a51979d
Merge "Revert "Switch to toybox tar.""
2019-06-25 05:24:44 +00:00
Jaewoong Jung
5b425e2e20
Optionally embed NOTICE files in apks.
...
If embed_notices or ALWAYS_EMBED_NOTICES is set, collect NOTICE files
from all dependencies of the android_app, merge them with the app's own
one (if exists), transform it to HTML, gzip it, and put it as an asset
in the final APK output.
Bug: 135460391
Test: app_test.go
Change-Id: I52d92e2fd19b3f5f396100424665c5cc344190d8
2019-06-24 19:10:22 -07:00
Elliott Hughes
afeb6cb817
Revert "Switch to toybox tar."
...
This reverts commit 3b584b7861
2019-06-25 01:40:42 +00:00
Patrice Arruda
55ac3ddb21
Merge "Soong: Add build_error proto raw file to $(OUT_DIR)." am: 7d7cae85ab
...
am: 9f9778cff0
2019-06-24 16:43:43 -07:00
Colin Cross
98483bf19f
Merge "Color long running durations when using action table output" am: bbeb2c1a50
...
am: 60e8b47a21
2019-06-24 16:43:25 -07:00
Patrice Arruda
9f9778cff0
Merge "Soong: Add build_error proto raw file to $(OUT_DIR)."
...
am: 7d7cae85ab
2019-06-24 16:39:59 -07:00
Elliott Hughes
17cf147e0e
Merge "Switch to toybox tar." am: 9b74dfe96c
...
am: 7afeb9a4c3
2019-06-24 16:39:27 -07:00
Colin Cross
60e8b47a21
Merge "Color long running durations when using action table output"
...
am: bbeb2c1a50
2019-06-24 16:39:25 -07:00
Paul Duffin
b5be0c72ee
Remove the no_framework_libs property am: 5c2f963a1d
...
am: 334a008188
2019-06-24 16:38:34 -07:00
Elliott Hughes
7afeb9a4c3
Merge "Switch to toybox tar."
...
am: 9b74dfe96c
2019-06-24 16:32:41 -07:00
Paul Duffin
334a008188
Remove the no_framework_libs property
...
am: 5c2f963a1d
2019-06-24 16:32:14 -07:00
Treehugger Robot
7d7cae85ab
Merge "Soong: Add build_error proto raw file to $(OUT_DIR)."
2019-06-24 22:59:33 +00:00
Colin Cross
bbeb2c1a50
Merge "Color long running durations when using action table output"
2019-06-24 21:38:51 +00:00
Elliott Hughes
9b74dfe96c
Merge "Switch to toybox tar."
2019-06-24 21:24:53 +00:00
Patrice Arruda
297cebad26
Soong: Add build_error proto raw file to $(OUT_DIR).
...
Soong_ui produces a build_error raw file to $(OUT_DIR) where
the file contains a list of build action errors. Each build action
error represents an error raised by a command. The build_error file
is populated if there was a build error.
Bug: b/132969697
Test: Ran m for successful build. Introduced a broken build change,
ran m and verified using printproto that build_error was
generated successfully.
Change-Id: I690ca1778b4e56f144a3173ba1d16d8494c32c15
2019-06-24 13:02:35 -07:00
Colin Cross
5137de0bdd
Color long running durations when using action table output
...
When printing the action table, color the duration of commands that
have been running for 30 seconds yellow, and commands that have been
running for 60 seconds red.
Test: manual
Change-Id: I61cb21b0dae10811d345cb9f62cd07915cfc69ee
2019-06-24 10:49:11 -07:00
Colin Cross
f8f6c5ed6a
Merge "Allow passing --legacy in aaptflags" am: 84338df001
...
am: e4bcefdbee
2019-06-24 08:56:13 -07:00
Paul Duffin
5c2f963a1d
Remove the no_framework_libs property
...
Corrects an error message that refers to no_framework_libs.
Removes any tests that use no_framework_libs:true where possible as
there are duplicate tests for sdk_version:"core_platform". Otherwise,
switches them over to use sdk_version:"core_platform".
Bug: 134566750
Test: m droid
Change-Id: I41abe1a49f5c744e3393ca9cdf0c41888f810c9f
2019-06-24 16:03:56 +01:00
Colin Cross
e4bcefdbee
Merge "Allow passing --legacy in aaptflags"
...
am: 84338df001
2019-06-24 07:57:00 -07:00
Treehugger Robot
84338df001
Merge "Allow passing --legacy in aaptflags"
2019-06-24 00:59:15 +00:00
Colin Cross
a0ba2f5858
Allow passing --legacy in aaptflags
...
--legacy will soon no longer be passed by default to all aapt2
compiles. Allow it to be specified in aaptflags by passing it to
aapt2 compile when it is present and filtering it out from the
flags passed to aapt2 link.
Bug: 135597368
Test: m java
Change-Id: Ib65d1a9b7c32ae4ff5ab6f58e66aedfb5f296712
2019-06-22 12:59:27 -07:00
Colin Cross
e0318dec1b
Merge changes Ia77090da,I95a57f76 am: e264f22bec
...
am: 0240f5cea1
2019-06-21 10:51:45 -07:00
Colin Cross
0240f5cea1
Merge changes Ia77090da,I95a57f76
...
am: e264f22bec
2019-06-21 10:42:05 -07:00
Colin Cross
e264f22bec
Merge changes Ia77090da,I95a57f76
...
* changes:
Fix data races in finder_test.go
Optimize sanitizerRuntimeDepsMutator
2019-06-21 17:01:23 +00:00
Patrice Arruda
4b557d8f86
Merge "Soong: Add BUILD_MODULES build action in soong_ui." am: 45cdb71290
...
am: d009ef35b8
2019-06-20 20:59:32 -07:00
Patrice Arruda
d009ef35b8
Merge "Soong: Add BUILD_MODULES build action in soong_ui."
...
am: 45cdb71290
2019-06-20 20:45:29 -07:00
Treehugger Robot
45cdb71290
Merge "Soong: Add BUILD_MODULES build action in soong_ui."
2019-06-21 03:11:34 +00:00
Mitch Phillips
a87c8005b4
Merge "Remove experimental pass manager for fuzzer builds." am: c4be0815d8
...
am: 07c9775cef
2019-06-20 18:17:19 -07:00
Colin Cross
28cbbe9ae4
Merge "Make apexMutator parallel" am: 17db3267f6
...
am: 118ce6c8a2
2019-06-20 18:16:35 -07:00
Mitch Phillips
07c9775cef
Merge "Remove experimental pass manager for fuzzer builds."
...
am: c4be0815d8
2019-06-20 18:07:41 -07:00
Colin Cross
118ce6c8a2
Merge "Make apexMutator parallel"
...
am: 17db3267f6
2019-06-20 18:07:17 -07:00
Treehugger Robot
c4be0815d8
Merge "Remove experimental pass manager for fuzzer builds."
2019-06-21 00:51:26 +00:00
Treehugger Robot
17db3267f6
Merge "Make apexMutator parallel"
2019-06-21 00:04:01 +00:00
Patrice Arruda
3928206ecc
Soong: Add BUILD_MODULES build action in soong_ui.
...
There was one case that did not work:
1) Create dir in root source tree
2) Run "m libc"
The build would fail as it was using the mma logic. A separate
one named BUILD_MODULES was added to allow building specific
modules in any directories using the "m" command.
Bug: b/130049705
Test: unit test cases, ran "m libc" in a tmp directory inside
of the source tree.
Change-Id: I8d23e685a673a311001ee8edd89bd73b662392dd
2019-06-20 16:35:12 -07:00
Elliott Hughes
8d6a986ada
Merge "Allow gzcat as an alias for gzip's -dc mode." am: 63e70530d3
...
am: 920a33bbbb
2019-06-20 16:26:37 -07:00
Dan Willemsen
9178a6ccb7
Merge "Use prebuilt m4 instead of system m4" am: d9cf7fc48e
...
am: 809fb63cc1
2019-06-20 16:18:02 -07:00
Dan Willemsen
51ff37cbb4
Fix typo in java system modules makevars am: fe310be720
...
am: 43ed1dbcad
2019-06-20 16:16:10 -07:00
Elliott Hughes
920a33bbbb
Merge "Allow gzcat as an alias for gzip's -dc mode."
...
am: 63e70530d3
2019-06-20 16:15:37 -07:00
Dan Willemsen
809fb63cc1
Merge "Use prebuilt m4 instead of system m4"
...
am: d9cf7fc48e
2019-06-20 15:38:45 -07:00
Dan Willemsen
43ed1dbcad
Fix typo in java system modules makevars
...
am: fe310be720
2019-06-20 15:38:29 -07:00
Colin Cross
2f5a484ee1
Fix data races in finder_test.go
...
Fix data races by incrementing clock before starting the finder.
Fixes:
==================
WARNING: DATA RACE
Read at 0x00c0003be1c0 by goroutine 99:
android/soong/finder/fs.(*MockFs).WriteFile()
build/soong/finder/fs/fs.go:159 +0x869
android/soong/finder.(*Finder).dumpDb()
build/soong/finder/finder.go:1163 +0x296
android/soong/finder.(*Finder).goDumpDb.func1()
build/soong/finder/finder.go:337 +0x3c
Previous write at 0x00c0003be1c0 by goroutine 43:
android/soong/finder.TestDirectoryNotPermitted()
build/soong/finder/fs/fs.go:155 +0x49a
testing.tRunner()
prebuilts/go/linux-x86/src/testing/testing.go:865 +0x163
Goroutine 99 (running) created at:
android/soong/finder.(*Finder).goDumpDb()
build/soong/finder/finder.go:336 +0x8d
android/soong/finder.(*Finder).loadFromFilesystem()
build/soong/finder/finder.go:380 +0x12b
android/soong/finder.newImpl()
build/soong/finder/finder.go:197 +0x38d
android/soong/finder.newFinderAndErr()
build/soong/finder/finder_test.go:58 +0x245
android/soong/finder.newFinderWithNumThreads()
build/soong/finder/finder_test.go:42 +0xb3
android/soong/finder.TestDirectoryNotPermitted()
build/soong/finder/finder_test.go:38 +0x386
testing.tRunner()
prebuilts/go/linux-x86/src/testing/testing.go:865 +0x163
Goroutine 43 (running) created at:
testing.(*T).Run()
prebuilts/go/linux-x86/src/testing/testing.go:916 +0x65a
testing.runTests.func1()
prebuilts/go/linux-x86/src/testing/testing.go:1157 +0xa8
testing.tRunner()
prebuilts/go/linux-x86/src/testing/testing.go:865 +0x163
testing.runTests()
prebuilts/go/linux-x86/src/testing/testing.go:1155 +0x523
testing.(*M).Run()
prebuilts/go/linux-x86/src/testing/testing.go:1072 +0x2eb
main.main()
out/soong/.bootstrap/soong-finder/test/test.go:157 +0x1dc
==================
Test: run finder_test.go with race detector enabled
Change-Id: Ia77090dabaf8b14a80ac9ce938fef75f1d382574
2019-06-20 15:24:05 -07:00
Colin Cross
0b90833ea8
Optimize sanitizerRuntimeDepsMutator
...
sanitizerRuntimeDepsMutator only modifies the currently visited
module, it can visit modules in parallel.
Also, stop recursing into modules that are not static dependencies,
and stop recursing if the module already has all modifications that
the mutator could make.
Test: m checkbuild
Change-Id: I95a57f763a91940f1854ba3c587a2f70e8baba97
2019-06-20 15:23:41 -07:00
Elliott Hughes
63e70530d3
Merge "Allow gzcat as an alias for gzip's -dc mode."
2019-06-20 21:03:11 +00:00
Dan Willemsen
d9cf7fc48e
Merge "Use prebuilt m4 instead of system m4"
2019-06-20 20:50:12 +00:00
Colin Cross
643614de24
Make apexMutator parallel
...
apexMutator only modifies the currently visited module, it can
visit modules in parallel.
Test: builds
Change-Id: I7d0ad142f5161742bd25dc57bac64c0f4a733ecf
2019-06-20 10:45:39 -07:00
Dan Willemsen
fe310be720
Fix typo in java system modules makevars
...
This was preventing us from actually using system module dependencies
from Make.
Fixes: 135679136
Test: EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9=true m legacy-performance-test-hostdex
Change-Id: Ic51c30d09cf39e35f2fe5f534a23273f450d9138
2019-06-20 10:17:35 -07:00
