Automerger Merge Worker
b9e4422fe4
Merge changes I828b3e6b,I5d85ea8b am: 5f5809a098 am: 046fda828c
...
Change-Id: I2ba44abb009d2c953c314eac21be88e16421c440
2020-01-15 20:50:20 +00:00
Matthew Maurer
046fda828c
Merge changes I828b3e6b,I5d85ea8b
...
am: 5f5809a098
Change-Id: I9404095b752929514297e8a6f31666e4055ada2d
2020-01-15 12:30:59 -08:00
Matthew Maurer
5f5809a098
Merge changes I828b3e6b,I5d85ea8b
...
* changes:
rust: Do not pass -C prefer-dynamic for cdylib
rust: Include Soong module name as metadata
2020-01-15 20:28:25 +00:00
Automerger Merge Worker
d14100fed9
Merge "Disallow system m4" am: 0b031cf181 am: 7e3950624e
...
Change-Id: I49e9fed45d8329a59f7879ccd74181b4d318d436
2020-01-15 19:58:55 +00:00
Dan Willemsen
7e3950624e
Merge "Disallow system m4"
...
am: 0b031cf181
Change-Id: I7f4a795ed3bb65de5aea7e9e4b6f6f56be29c691
2020-01-15 11:41:12 -08:00
Treehugger Robot
0b031cf181
Merge "Disallow system m4"
2020-01-15 19:38:22 +00:00
Matthew Maurer
46c46ccafd
rust: Do not pass -C prefer-dynamic for cdylib
...
cdylib targets cannot currently dynamically link to Rust crates, so this
flag was not actually doing anything, and in conjunction with -C lto
which we *do* want on for this target, causes a hard error on
rustc-1.40.0.
Bug: 147438124
Test: Build a rust_library module, this implicitly tries to build cdylib
Change-Id: I828b3e6bae7c58f4081db3e73009b443a382a296
2020-01-15 08:37:46 -08:00
Matthew Maurer
22cef966e1
rust: Include Soong module name as metadata
...
If we want to build a component which uses two versions of a crate in
the dependency graph (for example, libc in std and libc from
external/crates), Rust requires at least one of them have a metadata
field to differentiate them.
Since Soong module names should be distinct for a given target, they
should serve as metadata.
Bug: 147397356
Test: Build a rust library with "rlibs: ["liblibc"]" in the blueprint
Change-Id: I5d85ea8b3197972c09de301c9523efaff08adf81
2020-01-15 08:37:42 -08:00
Automerger Merge Worker
a7c65b295e
Merge "Reland^2 "m <apex_name>-deps-info prints the internal/external deps of the APEX"" am: 814bebb8ea am: 8d050e8e6e
...
Change-Id: I2d32b9b1f8bd450f5ec4b19926001989d801dd50
2020-01-15 06:29:02 +00:00
Jiyong Park
8d050e8e6e
Merge "Reland^2 "m <apex_name>-deps-info prints the internal/external deps of the APEX""
...
am: 814bebb8ea
Change-Id: I20352a3728ea7417090e46e8bfa5a8d75dc3ce5c
2020-01-14 22:14:19 -08:00
Treehugger Robot
814bebb8ea
Merge "Reland^2 "m <apex_name>-deps-info prints the internal/external deps of the APEX""
2020-01-15 06:12:45 +00:00
Automerger Merge Worker
4ad8d0d859
Merge "Allow sdk and core modules to use sysprop_library" am: a46c2b1994 am: ed000d7832
...
Change-Id: Ib49159f5bbfedd318866c8ccf939bb5e44233325
2020-01-15 01:12:23 +00:00
Inseob Kim
ed000d7832
Merge "Allow sdk and core modules to use sysprop_library"
...
am: a46c2b1994
Change-Id: I0901e86188677a28263483cd939ac49563efa7f1
2020-01-14 17:01:19 -08:00
Inseob Kim
a46c2b1994
Merge "Allow sdk and core modules to use sysprop_library"
2020-01-15 00:32:00 +00:00
Automerger Merge Worker
2788a6061e
Merge "Make android_test_helper_app support apex_available" am: ee76fba905 am: 305b6a7e4e
...
Change-Id: I7f1acdc916e119435aa1332ffbfe0a215731e049
2020-01-14 13:13:21 +00:00
Anton Hansson
305b6a7e4e
Merge "Make android_test_helper_app support apex_available"
...
am: ee76fba905
Change-Id: I240799a87f24e02e59bbcce460fe3be46a64c092
2020-01-14 05:01:23 -08:00
Anton Hansson
ee76fba905
Merge "Make android_test_helper_app support apex_available"
2020-01-14 12:59:17 +00:00
Jiyong Park
83dc74b770
Reland^2 "m <apex_name>-deps-info prints the internal/external deps of the APEX"
...
This reverts commit 7cb4d378e7 .
Test: m
Test: ALLOW_MISSING_DEPENDENCIES=true DIST_DIR=out/dist ./art/tools/dist_linux_bionic.sh -j80 com.android.art.host
(in the master-art-host branch)
Change-Id: I9beca73aafdf42f03bfa19cf1634b2641dac417b
2020-01-14 18:40:56 +09:00
Automerger Merge Worker
9651bdef91
Merge "Revert "Reland "m <apex_name>-deps-info prints the internal/external deps of the APEX"""" am: a7503367cf am: 39ed342b9b
...
Change-Id: Ia2493f500163b6b8bc8a4236c7f68ab427ed4112
2020-01-14 09:20:26 +00:00
Jiyong Park
39ed342b9b
Merge "Revert "Reland "m <apex_name>-deps-info prints the internal/external deps of the APEX""""
...
am: a7503367cf
Change-Id: I0d6fc06b1734edff88eb60345c4603c080460e87
2020-01-14 01:09:23 -08:00
Jiyong Park
a7503367cf
Merge "Revert "Reland "m <apex_name>-deps-info prints the internal/external deps of the APEX""""
2020-01-14 08:58:17 +00:00
Jiyong Park
7cb4d378e7
Revert "Reland "m <apex_name>-deps-info prints the internal/external deps of the APEX"""
...
This reverts commit 956305c61c .
Reason for revert: broke master-art-host branch
Exempt-From-Owner-Approval: reverting a bad change
Change-Id: Id7faed4ee85328c7c65847a3543ea9e67a3d50b3
2020-01-14 08:58:02 +00:00
Inseob Kim
c52395135f
Allow sdk and core modules to use sysprop_library
...
This allows javaSdk and javaCore modules to link against Public stub of
Platform owned sysprop_library.
Bug: 141246285
Test: m nothing
Change-Id: Ie11c43cc72ddd0ee13e4163955775c13eb9dbe92
2020-01-14 15:58:59 +09:00
Automerger Merge Worker
500fddf35c
Merge "Reland "m <apex_name>-deps-info prints the internal/external deps of the APEX""" am: 17c51a4ff6 am: acf9d43674
...
Change-Id: I3ab70327b2f5799d847c34cd1db32b40082e8002
2020-01-14 02:50:22 +00:00
Jiyong Park
acf9d43674
Merge "Reland "m <apex_name>-deps-info prints the internal/external deps of the APEX"""
...
am: 17c51a4ff6
Change-Id: I0e87c8daffac11f3a867d148068110fa6658aec1
2020-01-13 18:42:54 -08:00
Treehugger Robot
17c51a4ff6
Merge "Reland "m <apex_name>-deps-info prints the internal/external deps of the APEX"""
2020-01-14 02:40:42 +00:00
Automerger Merge Worker
a129af41a5
Merge "Prevent overridden APEX from being installed even when flattened" am: 0ed107d542 am: 8870b634aa
...
Change-Id: I87651861912a87e309bb8dbd2126c9a779c0e5e7
2020-01-14 01:15:56 +00:00
Jiyong Park
8870b634aa
Merge "Prevent overridden APEX from being installed even when flattened"
...
am: 0ed107d542
Change-Id: I1c2267c01c28d796596deccdff840b8e599e00c0
2020-01-13 17:01:47 -08:00
Treehugger Robot
0ed107d542
Merge "Prevent overridden APEX from being installed even when flattened"
2020-01-14 00:57:31 +00:00
Automerger Merge Worker
d28385db92
Merge "Revert "use symlink for bundled APEX"" am: 47b461782b am: 2fb8670829
...
Change-Id: Ib3101d6514a2e9174c969a0bcbfe4357be9dd2c6
2020-01-14 00:29:22 +00:00
Lokesh Gidra
2fb8670829
Merge "Revert "use symlink for bundled APEX""
...
am: 47b461782b
Change-Id: I4d6787fe86ea70a9d36bdac9e158bb7f1cac2e5c
2020-01-13 16:15:08 -08:00
Lokesh Gidra
47b461782b
Merge "Revert "use symlink for bundled APEX""
2020-01-14 00:08:15 +00:00
Lokesh Gidra
31c65d4fe4
Revert "use symlink for bundled APEX"
...
This reverts commit 58ab941c6c .
Reason for revert: art-com_android_runtime_host-linux_bionic and art-linux-bionic-zipapex builds failing (https://android-build.googleplex.com/builds/submitted/6131062/art-com_android_runtime_host-linux_bionic/latest/view/logs/build.log )
Bug: 144533348
Change-Id: I040af6887aea205a5d72a416fc8e6533dcfa08dd
2020-01-14 00:06:41 +00:00
Automerger Merge Worker
4a22c03773
Merge "Switch to toybox gzip." am: 5ce6dfbd36 am: 9087a9cbf4
...
Change-Id: I6366f1691a160df8711c59e5ddb5801a81b7aa31
2020-01-13 17:35:14 +00:00
Elliott Hughes
9087a9cbf4
Merge "Switch to toybox gzip."
...
am: 5ce6dfbd36
Change-Id: I99e67a837a73aab9fcc37d53dcbc9a2182c4c37d
2020-01-13 09:26:33 -08:00
Elliott Hughes
5ce6dfbd36
Merge "Switch to toybox gzip."
2020-01-13 17:21:02 +00:00
Automerger Merge Worker
0cccc9f972
Merge "use symlink for bundled APEX" am: 40ef4b926d am: dc733d74bc
...
Change-Id: I7ba15cad410502ae4627cd004b41f8b2ecceb792
2020-01-13 16:22:47 +00:00
Jiyong Park
dc733d74bc
Merge "use symlink for bundled APEX"
...
am: 40ef4b926d
Change-Id: I71dfb372cc36dbd56800d5dd6498f9a95fc04bba
2020-01-13 08:09:17 -08:00
Treehugger Robot
40ef4b926d
Merge "use symlink for bundled APEX"
2020-01-13 16:05:45 +00:00
Automerger Merge Worker
450072eefa
Merge "Use boot image extension in the JIT-zygote experiment." am: 4d9c97bd77 am: 856f6d458a
...
Change-Id: I6d1328318e452f8cbcc956363e645ffa553661f8
2020-01-13 11:16:47 +00:00
Ulyana Trafimovich
856f6d458a
Merge "Use boot image extension in the JIT-zygote experiment."
...
am: 4d9c97bd77
Change-Id: I76ea5217d5a8c5941b61c71d36b3421f6f792749
2020-01-13 03:01:39 -08:00
Automerger Merge Worker
c15caef962
Merge "Do not add jacocoagent to framework libraries in static coverage builds." am: 289bd28f17 am: 10b887a354
...
Change-Id: I57ac18efaab74fe72d6f4aab5b85bbc78e557f7f
2020-01-13 10:41:06 +00:00
Ulyana Trafimovich
4d9c97bd77
Merge "Use boot image extension in the JIT-zygote experiment."
2020-01-13 10:38:01 +00:00
Ulyana Trafimovich
10b887a354
Merge "Do not add jacocoagent to framework libraries in static coverage builds."
...
am: 289bd28f17
Change-Id: I0933280da696845693dc7fcc798f98f541687cd8
2020-01-13 02:26:50 -08:00
Ulyana Trafimovich
289bd28f17
Merge "Do not add jacocoagent to framework libraries in static coverage builds."
2020-01-13 10:25:16 +00:00
Automerger Merge Worker
77c734043a
Merge "Don't dexpreopt APEX variant modules" am: 72d009e1ec am: 47d80cdf79
...
Change-Id: I77aa5c70ecb39f9c18306fc0ab22ec9097ca450b
2020-01-13 03:31:28 +00:00
Yo Chiang
47d80cdf79
Merge "Don't dexpreopt APEX variant modules"
...
am: 72d009e1ec
Change-Id: Ieb1c2c3b4a54f7d756adac816286ed4ff1cfb17a
2020-01-12 19:18:26 -08:00
Yo Chiang
72d009e1ec
Merge "Don't dexpreopt APEX variant modules"
2020-01-13 03:15:50 +00:00
Automerger Merge Worker
918864fa22
Merge "A test cc module is installable even if it's not available for platform" am: eecf99ce66 am: 931f464856
...
Change-Id: I49fe9bf7d99fc5dd7c11baf4764880186199992d
2020-01-13 00:49:55 +00:00
Jiyong Park
931f464856
Merge "A test cc module is installable even if it's not available for platform"
...
am: eecf99ce66
Change-Id: I5033edc711f7780c3367304644eed004ca816fd7
2020-01-12 16:33:37 -08:00