Commit Graph

10164 Commits

Author SHA1 Message Date
Nicolas Geoffray
9f04bacac6 Merge "Revert "Revert "Never strip and store dex files uncompressed when they are preopted on system."""
am: 59d15c192d

Change-Id: I2d51ba0d5c5affb391bed5322f64a4d64b2f72bd
2019-02-13 04:10:23 -08:00
Nicolas Geoffray
59d15c192d Merge "Revert "Revert "Never strip and store dex files uncompressed when they are preopted on system.""" 2019-02-13 11:59:39 +00:00
Nicolas Geoffray
fa6e9ec003 Revert "Revert "Never strip and store dex files uncompressed when they are preopted on system.""
This reverts commit 67e8ec1973.

Test: build && atest android.text.cts.EmojiTest#testEmojiGlyphWebView on Cuttlefish
Exempt-From-Owner-Approval: Got +2 from Colin, latest PS is a rebase across conflicts.

Change-Id: I99faf0f2ec698d70c107516bd43756b9ddcb90d0
2019-02-13 11:59:20 +00:00
Paul Duffin
55eb2f9e03 Support $(location...) in droiddoc_options
am: 1151247c29

Change-Id: Ife22fe8dcc94cd83d2757f07ebe39a7a9cdbdf92
2019-02-13 02:34:21 -08:00
Paul Duffin
a0957054ac Fix droiddoc handling of $(location ...)
am: 99e4a50202

Change-Id: I0f11abb344848b51c6fdd23345d1eef60edfe376
2019-02-13 02:22:50 -08:00
Paul Duffin
1151247c29 Support $(location...) in droiddoc_options
Adds droiddoc_option_files property which are passed through to
droiddoc's arg_files property.

Bug: 124220029
Test: make checkbuild
Change-Id: I6e98752cebeaac5a8779e04e6c804763c177e354
2019-02-13 10:11:54 +00:00
Paul Duffin
99e4a50202 Fix droiddoc handling of $(location ...)
Bug: 124218911
Test: make checkbuild
Change-Id: I4d9c52b40ce4e8b9ae07f557e079e4f101fbbe87
2019-02-13 10:11:54 +00:00
Jiyong Park
e4046ab31d Allow each APEX to provide its own AndroidManifest
am: 40e26a2a99

Change-Id: I20279ed7c9a5e18a42169ae6d5e45f905cdbdd71
2019-02-12 23:34:14 -08:00
Jiyong Park
40e26a2a99 Allow each APEX to provide its own AndroidManifest
AndroidManifest.xml file can be specified via the 'androidManifest'
property in the apex module type. It can be used to have a custom
AndroidManifest.xml that have additional tags (such as <uses-sdk> or
<uses-feature>) for precise targeting.

The property is optional; if unspecified, then one is auto-generated as
before.

Bug: 123857186
Test: m apex_test_build_features
Change-Id: Id7ee0471661887cfa11124cbaa3beea8cffcdda4
2019-02-13 16:24:59 +09:00
Alex Light
2d310f950b Merge "Always build zipapex's unflattened."
am: ad0328deb8

Change-Id: I38e5502b8be3c3948a936f51c625dd0b4ca53030
2019-02-12 22:29:07 -08:00
Treehugger Robot
ad0328deb8 Merge "Always build zipapex's unflattened." 2019-02-13 06:19:54 +00:00
Colin Cross
7e071999a2 Add OutputPath.ReplaceExtension()
am: 8854a5a805

Change-Id: Ie79a3410a739879d8c14a8b66bb5656ee808a1b4
2019-02-12 17:18:43 -08:00
Colin Cross
77ccfd8324 Add RuleBuilderCommand.FlagForEachArg()
am: c7ed004dd3

Change-Id: I670c997252c9cabb32297246499bdde561c7fae2
2019-02-12 17:18:33 -08:00
Colin Cross
97e623455c Use ArchType in dexpreopt config
am: 74ba962d29

Change-Id: I3b88b561922ca0e88ab17cfc05eecb65146bfe85
2019-02-12 17:18:19 -08:00
Colin Cross
78f9df046e Merge "Make java_sdk_library implement Dependency"
am: 1cd8a57510

Change-Id: Iaf7f80cd5095a8b49f6c308b71d78730a71b133d
2019-02-12 17:17:56 -08:00
Colin Cross
c8e7005b65 Merge "Move dexpreopt image selection out of dexpreopt package"
am: a5ffe2426f

Change-Id: Ia6a12a33bf59630191a0c0bd97cea5bf040bcf6f
2019-02-12 17:15:44 -08:00
Colin Cross
8854a5a805 Add OutputPath.ReplaceExtension()
Add a helper method that returns a new OutputPath with the
extension replaced.

Test: paths_test.go
Change-Id: I7f93b3475031a19b53652022740488373a1b7d97
2019-02-12 17:07:35 -08:00
Colin Cross
c7ed004dd3 Add RuleBuilderCommand.FlagForEachArg()
Add an analog to FlagForEachInput that takes non-path arguments.

Test: rule_builder_test.go
Change-Id: Ifdf5a16079018bfff9b06ce48b13b104a93fddd7
2019-02-12 17:07:35 -08:00
Colin Cross
74ba962d29 Use ArchType in dexpreopt config
Make ArchType implement the encoding.TextMarshaller and
encoding.TextUnmarshaller interfaces so that it can be used
as a value in the dexpreopt config structs that are passed
through JSON files.

Test: m checkbuild
Change-Id: Ie4c12443e7ee5fe43f42d5403bcde12d62f617e2
2019-02-12 17:05:47 -08:00
Alex Light
2a2561f8ac Always build zipapex's unflattened.
Zipapex's cannot be flattened so do not prevent them from being built
even if TARGET_FLATTEN_APEX is set.

Test: lunch aosp_arm-eng;
      ALLOW_MISSING_DEPENDENCIES=true \
      ./art/tools/build_linux_bionic.sh com.android.runtime.host

Bug: 124333446
Change-Id: I4bef65cce100136a8f7852692e841b62ed9e399f
2019-02-12 17:04:47 -08:00
Elliott Hughes
7a6a06be27 Merge "Switch to one-true-awk."
am: a0f23ad233

Change-Id: I0d86bcab6ca9c6a917de3d9820db3c40a7f04bd5
2019-02-12 17:03:07 -08:00
Colin Cross
1cd8a57510 Merge "Make java_sdk_library implement Dependency" 2019-02-13 01:01:03 +00:00
Colin Cross
a5ffe2426f Merge "Move dexpreopt image selection out of dexpreopt package" 2019-02-13 01:00:49 +00:00
Elliott Hughes
a0f23ad233 Merge "Switch to one-true-awk." 2019-02-13 00:56:35 +00:00
Colin Cross
f54b401be4 Merge "Run makevars singleton after all other registered singletons"
am: a838004f8c

Change-Id: I9aec2658898401b7fc4988850a2481b5e5d915f0
2019-02-12 16:38:16 -08:00
Colin Cross
a838004f8c Merge "Run makevars singleton after all other registered singletons" 2019-02-13 00:27:33 +00:00
Colin Cross
03d895fadd Merge "Make OncePer.Once reentrant"
am: 75569e0f46

Change-Id: Ide8389fa5ff740fcec9ced5fbab43c481f1ce969
2019-02-12 15:13:27 -08:00
Treehugger Robot
75569e0f46 Merge "Make OncePer.Once reentrant" 2019-02-12 22:58:09 +00:00
Colin Cross
f58cd04e47 Merge "Change type of Once keys to OnceKey"
am: 450bde14b8

Change-Id: Id4febec2a6cb7d8b1cc58bc0d24480dfa9d8cd12
2019-02-12 13:29:45 -08:00
Colin Cross
450bde14b8 Merge "Change type of Once keys to OnceKey" 2019-02-12 21:13:56 +00:00
Colin Cross
e5cdaf9221 Make OncePer.Once reentrant
The value constructor passed to OncePer.Once may call back into
Once.  Replace the global mutex with a temporary channel stored
in the map using the key, and have callers for the same key
wait on the channel if they find it instead of a real value.

Test: TestOncePerReentrant
Change-Id: Ifa88a3c48981b5076b83f47fbdee5d26311725c6
2019-02-12 19:03:53 +00:00
Jiyong Park
fca445dfd2 Merge "Add prefer_sanitize.* properties to apex"
am: 02f3e09450

Change-Id: Ifeab3f878be1cd3842ca2edb0348dfdf0a2ea50f
2019-02-11 22:53:10 -08:00
Jiyong Park
02f3e09450 Merge "Add prefer_sanitize.* properties to apex" 2019-02-12 06:44:00 +00:00
Colin Cross
cf3e29beef Merge "Add support for use_embedded_dex in Soong"
am: 7805791106

Change-Id: I1ce2d1e0b90c5cdac22e9462d5e78bff258e8258
2019-02-11 17:12:33 -08:00
Colin Cross
7805791106 Merge "Add support for use_embedded_dex in Soong" 2019-02-12 00:46:52 +00:00
Colin Cross
897d2ed92f Make java_sdk_library implement Dependency
dexpreopting boot jars is going to need to visit both java_library
and java_sdk_library modules.  Since java_sdk_library is already
a java_library module, move the SdkLibraryDependency methods out
of the way so that it will implement Dependency.  Also requries
re-ording some of the type switches to check for the more-specific
SdkLibraryDependency first.

Test: TestJavaSdkLibrary
Change-Id: I155c9ffaf31689dd150a4d99e07e432ff770b4a7
2019-02-11 15:29:51 -08:00
Colin Cross
c7e40aa578 Move dexpreopt image selection out of dexpreopt package
Instead of passing both the module and global dexpreopt image
selection into the dexpreopt package, determine the correct
dexpreopt image in the java package.

Also stop using the boot image "location" as an input, only
track the real path, and then convert it to the "location"
that dex2oat expects when constructing the command line.

Test: m checkbuild
Change-Id: I2be2b5917e09fd57428dab27849c0153fdc75722
2019-02-11 15:29:51 -08:00
Colin Cross
580d2ce642 Run makevars singleton after all other registered singletons
Move the makevars singleton after all dyamically registered
singletons, but before the env singleton, to ensure that it
can reference values initialized in other singletons.

Test: m checkbuild
Change-Id: I6ea45d3a174b94d4e89f3168894399e7022733e4
2019-02-11 15:29:51 -08:00
Colin Cross
e48ff5bbd4 Change type of Once keys to OnceKey
Require that the key for Once calls be created with NewOnceKey
or NewCustomOnceKey.

Test: m checkbuild
Change-Id: I44b8ea6034338b45f558f862b21d5732364cbf0f
2019-02-11 15:29:51 -08:00
Colin Cross
0ba1a099e0 Merge "Revert "Never strip and store dex files uncompressed when they are preopted on system.""
am: 8e41cdb267

Change-Id: I77cce8996ae0789d3b71b0902360877786476d18
2019-02-11 11:43:11 -08:00
Colin Cross
8e41cdb267 Merge "Revert "Never strip and store dex files uncompressed when they are preopted on system."" 2019-02-11 19:31:31 +00:00
Colin Cross
67e8ec1973 Revert "Never strip and store dex files uncompressed when they are preopted on system."
This reverts commit 4bb0106759.

Reason for revert: b/123436620

Change-Id: Ia7595ace4b76abaa99dbb651e7d2f088dec5bad9
2019-02-11 19:30:46 +00:00
Jaewoong Jung
4c8f798413 Merge "Make PrebuiltEtcHostFactory public."
am: 0dcfee56b8

Change-Id: I7b694328857177a5fb0a8c0e330a4c150c41c805
2019-02-11 08:30:04 -08:00
Jaewoong Jung
0dcfee56b8 Merge "Make PrebuiltEtcHostFactory public." 2019-02-11 16:22:13 +00:00
Nicolas Geoffray
6adc67079e Never strip and store dex files uncompressed when they are preopted on system.
am: 4bb0106759

Change-Id: I814c37f0db27cf951710ff391563cc3db13118d9
2019-02-11 02:40:17 -08:00
Nicolas Geoffray
4bb0106759 Never strip and store dex files uncompressed when they are preopted on system.
In order for the runtime module to always be able to compile apps,
make sure we keep a copy of the dex files optimally.

Gated by a product flag if a product doesn't include the module yet.

Test: build
Change-Id: I4bfe00184fcfdf44b8d1866c5c550838b869c60a
2019-02-09 22:08:14 +00:00
Jiyong Park
d563bc7b92 Merge "Static variant of a stubs lib is correctly tracked"
am: eebdf43337

Change-Id: I431341b18a2601b25fa459c0fb108ce9ae36b860
2019-02-08 21:08:03 -08:00
Treehugger Robot
eebdf43337 Merge "Static variant of a stubs lib is correctly tracked" 2019-02-09 04:56:07 +00:00
Mikhail Naganov
15aed6fdd4 Merge "Docs: update path to soong_build.html"
am: 2851b8dad5

Change-Id: I58bd3e30cbd87c0e981e3d47448d9a791ba72157
2019-02-08 20:30:57 -08:00
Treehugger Robot
2851b8dad5 Merge "Docs: update path to soong_build.html" 2019-02-09 04:24:27 +00:00