Commit Graph

17866 Commits

Author SHA1 Message Date
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
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
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
Automerger Merge Worker
9280bf9474 Merge "Sandbox soong_build by changing to root directory" am: ae7cddd5ad am: 70eefb570a
Change-Id: I83d48a8f83702c1e79c8c956f59c4e574c08c508
2020-01-11 07:17:14 +00: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
Automerger Merge Worker
ff367b69af Merge "Rename OverridableModuleBase.properties." am: 5fa3a1f743 am: 1e38e20682
Change-Id: I6a65624e4f2f8ac01d323fdf0e1d91c1ffb3cf35
2020-01-11 00:15:48 +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
Automerger Merge Worker
f84fe5fbd4 Merge "Revert "Sandbox soong_build by changing to root directory"" am: e734832d25 am: 408fab4d25
Change-Id: I5ebfedfbc8b8009495fcfe77a60af5111e95ad73
2020-01-10 22:19:01 +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