Commit Graph

14062 Commits

Author SHA1 Message Date
Colin Cross
f5300d729e Merge "Uncompress dex in unbundled privileged apps" am: 49eb5477c7
am: d7f9313e5b

Change-Id: I2f9baa99918d5730af3f7df1fc0671d4b6644ebe
2019-06-25 18:54:13 -07:00
Colin Cross
d7f9313e5b Merge "Uncompress dex in unbundled privileged apps"
am: 49eb5477c7

Change-Id: I84058cb40912486118bb32ee662f2331987af85f
2019-06-25 18:35:53 -07:00
Treehugger Robot
49eb5477c7 Merge "Uncompress dex in unbundled privileged apps" 2019-06-26 00:51:45 +00:00
Jaewoong Jung
1cd69eeb4c Create test build dir only once for apex_test. am: c1001ec0c5
am: 4ef772eee9

Change-Id: I9ccf41b00b05c7b9a69e206fccd259e84b7d2988
2019-06-25 15:58:29 -07:00
Jaewoong Jung
4ef772eee9 Create test build dir only once for apex_test.
am: c1001ec0c5

Change-Id: Id1cc21b3070a5392e900f38f392c20dacff3475d
2019-06-25 15:47:20 -07:00
Colin Cross
53a87f523b Uncompress dex in unbundled privileged apps
Mainline builds privileged apps unbundled and then uses them as
prebuilts, so they need to respect the privileged flag when
deciding whether or not to uncompress the dex.

Bug: 135772877
Test: TestUncompressDex
Change-Id: I91da7116b779ae35c0617ef77dbcb9788902370c
2019-06-25 13:36:46 -07:00
Jaewoong Jung
c1001ec0c5 Create test build dir only once for apex_test.
Test: apex_test.go
Change-Id: Ib96ea4ec5d5ff0d8e8cf4a9eb479099cf2b1977c
2019-06-25 11:20:53 -07:00
Jaewoong Jung
6c6e43bc09 Merge changes from topic "apex_notice" am: 50c744e916
am: 69f8f238cb

Change-Id: Ic17357ad03651ca850991cee9f7775be7c9414a1
2019-06-25 10:03:37 -07:00
Jaewoong Jung
a4d59ff0b5 Optionally embed NOTICE files in apks. am: 5b425e2e20
am: 5d48965fed

Change-Id: I533808f0eafb496c34ece9d100784ebb9b5257e6
2019-06-25 10:03:31 -07:00
Jaewoong Jung
69f8f238cb Merge changes from topic "apex_notice"
am: 50c744e916

Change-Id: Idbc4061ce0998e2908eb3d9bb6ef362ad20d06f0
2019-06-25 09:59:40 -07:00
Jaewoong Jung
5d48965fed Optionally embed NOTICE files in apks.
am: 5b425e2e20

Change-Id: I0397838781d5ce7ba20778706d3b0ee4936080e8
2019-06-25 09:59:31 -07:00
Jaewoong Jung
50c744e916 Merge changes from topic "apex_notice"
* changes:
  Embed NOTICE output as an APEX asset.
  Optionally embed NOTICE files in apks.
2019-06-25 16:41:16 +00:00
Elliott Hughes
788b2784c5 Merge "Revert "Switch to toybox tar."" am: ba9a51979d
am: 79c3096fb4

Change-Id: Ia24877001d9185efb689ef7caa886d1d381c7a21
2019-06-24 22:39:17 -07:00
Elliott Hughes
79c3096fb4 Merge "Revert "Switch to toybox tar.""
am: ba9a51979d

Change-Id: I094b68c7937d93abe1a76639d667a1191594f6c6
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
14f5ff62c9 Embed NOTICE output as an APEX asset.
Instead of outputting an aggregated NOTICE file as an intermediate build
resource to allow Make to include it in the final system-wide NOTICE,
process and embed it as an asset in the final APEX. This allows us to
update the NOTICE contents automatically when an APEX is updated.

Fixes: 135218846
Test: Built mainline modules, apex_test.go
Change-Id: Ic851b330fe93be1f602907d44ecc7886c3b0171b
2019-06-24 20:10:34 -07: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.

Reason for revert: missing --mode.

Change-Id: I0cde94c38905e26c79c31a03fd0177d7d57daa32
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

Change-Id: I7d2ee16ad31446360142295c61562cff467f9d19
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

Change-Id: I624835d3b43bc6b86e5c76b3c4029e7330f3b4cb
2019-06-24 16:43:25 -07:00
Patrice Arruda
9f9778cff0 Merge "Soong: Add build_error proto raw file to $(OUT_DIR)."
am: 7d7cae85ab

Change-Id: I4f9e8a307f8b61f392aee967ecade73438bc8a45
2019-06-24 16:39:59 -07:00
Elliott Hughes
17cf147e0e Merge "Switch to toybox tar." am: 9b74dfe96c
am: 7afeb9a4c3

Change-Id: I6f8a815b69f52176abe8ec59e43dbed548020276
2019-06-24 16:39:27 -07:00
Colin Cross
60e8b47a21 Merge "Color long running durations when using action table output"
am: bbeb2c1a50

Change-Id: Ica426bcf82ccfeabe0d0472e20de3978207fc0a6
2019-06-24 16:39:25 -07:00
Paul Duffin
b5be0c72ee Remove the no_framework_libs property am: 5c2f963a1d
am: 334a008188

Change-Id: I6b2d63eca5c78599115c6d9a431f22e99fe7709c
2019-06-24 16:38:34 -07:00
Elliott Hughes
7afeb9a4c3 Merge "Switch to toybox tar."
am: 9b74dfe96c

Change-Id: If7aa3f065d4a93d516c2d80b931d5278c311cb8c
2019-06-24 16:32:41 -07:00
Paul Duffin
334a008188 Remove the no_framework_libs property
am: 5c2f963a1d

Change-Id: I34358a01f4efd560c9cbaee00a2ad08b3e8aff67
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

Change-Id: Ie55ebc817c3f68612650549a8562cc72b9abe820
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

Change-Id: I7789f1715bd4a96294b6cbfbb3a8395cc8fa2780
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

Change-Id: I61e3e45e533cb62c548fcd09b2bf5eb3890e0a38
2019-06-21 10:51:45 -07:00
Colin Cross
0240f5cea1 Merge changes Ia77090da,I95a57f76
am: e264f22bec

Change-Id: I592a0344032e68e7c40b1545d384b325fbd3d896
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

Change-Id: I0216045ba79f0cc26a4de5883589f52a65d9919c
2019-06-20 20:59:32 -07:00
Patrice Arruda
d009ef35b8 Merge "Soong: Add BUILD_MODULES build action in soong_ui."
am: 45cdb71290

Change-Id: I329e25d33b12217e6df9c98b0a259017180afcba
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

Change-Id: I333316ff6041b6139b86bed5469885b42b6be96d
2019-06-20 18:17:19 -07:00
Colin Cross
28cbbe9ae4 Merge "Make apexMutator parallel" am: 17db3267f6
am: 118ce6c8a2

Change-Id: I91b0a094cec9b62faea53527b41fc7769bd0e85f
2019-06-20 18:16:35 -07:00
Mitch Phillips
07c9775cef Merge "Remove experimental pass manager for fuzzer builds."
am: c4be0815d8

Change-Id: I20a6898945be309f77f3c552919606377186fba2
2019-06-20 18:07:41 -07:00
Colin Cross
118ce6c8a2 Merge "Make apexMutator parallel"
am: 17db3267f6

Change-Id: I45d0dbaa5dbf77d4f4ae5fde7cff64c88336be2b
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

Change-Id: I194afd5c12a222d757f86c1d363a37ddba79d947
2019-06-20 16:26:37 -07:00