Commit Graph

17353 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Treehugger Robot eecf99ce66 Merge "A test cc module is installable even if it's not available for platform" 2020-01-13 00:31:58 +00:00
Jiyong Park 0abc1b484d Prevent overridden APEX from being installed even when flattened
Previously, both overridden APEX and overriding APEX were installed
together when TARGET_FLATTEN_APEX is set to true. This was because the
Make modules for flattened APEXes are phony where
LOCAL_OVERRIDES_MODULES isn't respected.

Fixing the problem by letting apex_manifest.pb for the overriding APEX
to override all modules for the overridden APEXes.

Bug: 147384966
Test: OVERRIDE_TARGET_FLATTEN_APEX=true m dump-files | grep
mediaprovider shows

:   out/target/product/coral/system/apex/com.google.android.mediaprovider/apex_manifest.pb
:   out/target/product/coral/system/apex/com.google.android.mediaprovider/apex_pubkey
:   out/target/product/coral/system/apex/com.google.android.mediaprovider/javalib/framework-mediaprovider.jar
:   out/target/product/coral/system/apex/com.google.android.mediaprovider/lib64/libfuse.so
:   out/target/product/coral/system/apex/com.google.android.mediaprovider/priv-app/MediaProvider/MediaProviderGoogle.apk

only

Change-Id: I6dc3fc7aaee0474cbad9fadbfce765be4b751328
2020-01-12 23:31:56 +09:00
Colin Cross 70eefb570a Merge "Sandbox soong_build by changing to root directory"
am: ae7cddd5ad

Change-Id: I5edc91d198fad76e5de6f79a775082f4f1df1cf9
2020-01-10 23:00:57 -08:00
Treehugger Robot ae7cddd5ad Merge "Sandbox soong_build by changing to root directory" 2020-01-11 06:00:21 +00:00
Colin Cross 988414c2cf Sandbox soong_build by changing to root directory
This relands I12a0f907753fefd1997ab8b4ea2ac331234093cf along with
a fix to blueprint for absolute paths.

Store the current working directory and then change to the root
directory so that all file accesses must go through helpers in
the android package that properly track dependencies.

Change-Id: I24ac485677aa102eec1a2521d16820da6ee1ae77
Fixes: 146437378
Test: m checkbuild
Test: m OUT_DIR=/tmp/out nothing
2020-01-11 01:11:46 +00:00
Jaewoong Jung 1e38e20682 Merge "Rename OverridableModuleBase.properties."
am: 5fa3a1f743

Change-Id: I1c6faacbe8cca7c5d617766d22afd0f2333c64d8
2020-01-10 16:05:18 -08:00
Treehugger Robot 5fa3a1f743 Merge "Rename OverridableModuleBase.properties." 2020-01-10 23:59:34 +00:00
Colin Cross 408fab4d25 Merge "Revert "Sandbox soong_build by changing to root directory""
am: e734832d25

Change-Id: I68c8d7a7d92ddd109c4759c16a38046b491a5eec
2020-01-10 14:08:14 -08:00
Colin Cross e734832d25 Merge "Revert "Sandbox soong_build by changing to root directory"" 2020-01-10 22:00:59 +00:00
Jaewoong Jung b64dd002b3 Rename OverridableModuleBase.properties.
The generic name causes confusion, even to the IDE.

Test: TreeHugger
Change-Id: I0cb4959ab41b4732e7ee7a5d1d818ef771674023
2020-01-10 13:26:00 -08:00
Colin Cross 47e4f9e1e8 Revert "Sandbox soong_build by changing to root directory"
This reverts commit 05c25ccb4a.

Reason for revert: broke absolute OUT_DIR
Bug: 146437378

Change-Id: I523ed79d40e1c1ef040212ba794a7a084abea75d
2020-01-10 18:51:04 +00:00
Colin Cross 856eff7fde Merge "Sandbox soong_build by changing to root directory"
am: e35e961aa9

Change-Id: I15a8dd990d211fff1f27efab230d565700ea1ff1
2020-01-10 09:37:51 -08:00
Colin Cross e35e961aa9 Merge "Sandbox soong_build by changing to root directory" 2020-01-10 17:35:22 +00:00
Kousik Kumar e829825a25 Merge "Add FLAG_compare to whitelisted environment variables"
am: 2827ccc126

Change-Id: I59a7cf192a0163c5818ef4b64a4e86508166cec1
2020-01-10 09:13:51 -08:00
Treehugger Robot 2827ccc126 Merge "Add FLAG_compare to whitelisted environment variables" 2020-01-10 16:49:22 +00:00