Commit Graph

18994 Commits

Author SHA1 Message Date
Automerger Merge Worker
acc79daa46 Merge "Use boot image extension in the JIT-zygote experiment." am: 4d9c97bd77 am: 856f6d458a am: 450072eefa
Change-Id: If09ec246abc01b803ff54b331fa301819b519297
2020-01-13 11:35:32 +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
a6cacb665b Merge "Do not add jacocoagent to framework libraries in static coverage builds." am: 289bd28f17 am: 10b887a354 am: c15caef962
Change-Id: I236faf7d3ba446d787303d1c9b9a2ecea2697e88
2020-01-13 10:57:41 +00: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
2aca61f31b Merge "Don't dexpreopt APEX variant modules" am: 72d009e1ec am: 47d80cdf79 am: 77c734043a
Change-Id: I1f72a27f7f5cdd32f862dc0294e08199cf8461c7
2020-01-13 03:45:31 +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
5f70666484 Merge "A test cc module is installable even if it's not available for platform" am: eecf99ce66 am: 931f464856 am: 918864fa22
Change-Id: I3faf4756c989e38a975b36e168e9bd1dbd7af98a
2020-01-13 01:01:51 +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
Automerger Merge Worker
889f0a3d41 Merge "Sandbox soong_build by changing to root directory" am: ae7cddd5ad am: 70eefb570a am: 9280bf9474
Change-Id: I7d749bf12f039ca72bd59f4264082043f1f14fde
2020-01-11 07:34:02 +00: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
aae3ee0e7b Merge "Rename OverridableModuleBase.properties." am: 5fa3a1f743 am: 1e38e20682 am: ff367b69af
Change-Id: Ie8d88ed7ae467332973603fa70f70e4ce53e3212
2020-01-11 00:33:05 +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
8c02671d51 Merge "Revert "Sandbox soong_build by changing to root directory"" am: e734832d25 am: 408fab4d25 am: f84fe5fbd4
Change-Id: Iac451a70c28566f8413b2495e8ae8a24b80e2a2f
2020-01-10 22:31:07 +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
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
13e8cb9b4c Merge "Sandbox soong_build by changing to root directory" am: e35e961aa9 am: 856eff7fde
am: a2040fc892

Change-Id: I31d8b52f57f685bc69aab817d9b4eebcafaf78df
2020-01-10 11:14:39 -08:00
Kousik Kumar
a2baf8f542 Merge "Add FLAG_compare to whitelisted environment variables" am: 2827ccc126 am: e829825a25
am: 28e648b24f

Change-Id: I58dc82056a210e72f8c9acdfb1a3994d3c68494d
2020-01-10 11:14:24 -08:00
Matthew Maurer
72307f16cb Merge "Remove libterm from implicit crates" am: 9155b298fd am: e31b2acabf
am: cc5e2ece62

Change-Id: I68c658338f3be198ea01dcb77986f23956e7246a
2020-01-10 11:13:51 -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
Automerger Merge Worker
a2040fc892 Merge "Sandbox soong_build by changing to root directory" am: e35e961aa9 am: 856eff7fde
Change-Id: Ia87a5cdf22748c04990da9b835e67d8a5dfdc1a6
2020-01-10 17:52:45 +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
Automerger Merge Worker
28e648b24f Merge "Add FLAG_compare to whitelisted environment variables" am: 2827ccc126 am: e829825a25
Change-Id: I7e17514f6dd61ec46198e7c8b71603de3abfa8a5
2020-01-10 17:23:33 +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
Automerger Merge Worker
cc5e2ece62 Merge "Remove libterm from implicit crates" am: 9155b298fd am: e31b2acabf
Change-Id: I99802fd479f4462072bc0c123838f739d10b7356
2020-01-10 16:36:50 +00:00
Matthew Maurer
e31b2acabf Merge "Remove libterm from implicit crates"
am: 9155b298fd

Change-Id: Iae5f54ee73c936f6f1981724fcffc0373ca93529
2020-01-10 08:24:49 -08:00
Matthew Maurer
9155b298fd Merge "Remove libterm from implicit crates" 2020-01-10 16:23:32 +00:00
Ulya Trafimovich
57547452cf Use boot image extension in the JIT-zygote experiment.
Test: temporarily enable JIT-zygote configuration, build, boot the
  device and ensure that the JIT-zygote specific boot image
  apex-framework.art is mapped in the zygote address space:

  1. enable Jit zygote in the product device config (in my case
    device/google/muskie/aosp_walleye.mk):

    +# System server should not contain compiled code.
    +PRODUCT_SYSTEM_SERVER_COMPILER_FILTER := verify
    +
    +# Use the apex image for preopting.
    +DEXPREOPT_USE_APEX_IMAGE := true
    +
    +# Have the runtime pick up the apex image.
    +PRODUCT_PROPERTY_OVERRIDES += \
    +    dalvik.vm.boot-image=/apex/com.android.art/javalib/apex.art:/system/framework/apex-framework.art

  2. lunch aosp_walleye-userdebug \
    && m \
    && adb reboot bootloader \
    && fastboot flashall -w

  3. adb shell cat /proc/`adb shell ps | grep zygote64 | awk {'print $2'}`/maps | grep apex-framework.art
  6fe44000-7025c000 rw-p 00000000 fc:02 1179718                            /data/dalvik-cache/arm64/apex@com.android.art@javalib@apex-framework.art
  70571000-70696000 rw-p 0072d000 fc:02 1179718                            /data/dalvik-cache/arm64/apex@com.android.art@javalib@apex-framework.art
  75a339f000-75a33ac000 r--p 00852000 fc:02 1179718                        /data/dalvik-cache/arm64/apex@com.android.art@javalib@apex-framework.art

Change-Id: I5493e575ebf90bad1d5ad2850004d54590bbc079
2020-01-10 15:29:25 +00:00
Colin Cross
05c25ccb4a Sandbox soong_build by changing to root directory
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.

Fixes: 146437378
Test: m checkbuild
Change-Id: I12a0f907753fefd1997ab8b4ea2ac331234093cf
2020-01-09 14:19:46 -08:00
Matthew Maurer
e7d7b6d924 Remove libterm from implicit crates
This is no longer shipped by rustc, and wasn't really intended to be
implicitly available in the first place.

Bug: 147432625
Test: Built a sample rust device binary
Change-Id: I3c33ac3726c788debe14ed39a9ecbae7a7449351
2020-01-09 12:24:58 -08:00
Kousik Kumar
ade12e744a Add FLAG_compare to whitelisted environment variables
Bug: b/147419757
Test: Ran a compare build and tested that compare mode works again

Change-Id: I743d5070673f3ec9d0c2b099019f88935f3894fc
2020-01-09 08:53:01 -08:00
Automerger Merge Worker
169b98074c Merge "Revert^2 "Use boot image extension for framework libraries."" am: a773c39bfc am: 4e1c74edce am: 18114bcee6
Change-Id: I1950b09d526994dff5334d96c9dec645ed7abe2f
2020-01-09 13:49:19 +00:00
Automerger Merge Worker
18114bcee6 Merge "Revert^2 "Use boot image extension for framework libraries."" am: a773c39bfc am: 4e1c74edce
Change-Id: Iee482e79d2098988ad08e8eb64bf23a8052aaf5b
2020-01-09 13:29:33 +00:00
Ulyana Trafimovich
4e1c74edce Merge "Revert^2 "Use boot image extension for framework libraries.""
am: a773c39bfc

Change-Id: I994fda189b1880c394ed9e33a0912d0289697691
2020-01-09 05:22:30 -08:00