Commit Graph

18154 Commits

Author SHA1 Message Date
Automerger Merge Worker
7bd4aa2853 Merge "Store uncompressed and aligned DEX files for java libs in APEXes." am: 28e36b1455 am: 6a517467aa
Change-Id: Icf28801f92352049a9748313286b3939af9f2ea8
2020-01-29 10:44:07 +00:00
Ulyana Trafimovich
6a517467aa Merge "Store uncompressed and aligned DEX files for java libs in APEXes."
am: 28e36b1455

Change-Id: Ib6938d0f980604695c46a5ff6dbc8a7ff41e7ab0
2020-01-29 02:32:38 -08:00
Ulyana Trafimovich
28e36b1455 Merge "Store uncompressed and aligned DEX files for java libs in APEXes." 2020-01-29 10:25:33 +00:00
Automerger Merge Worker
b44012d8fb Merge "Fix rebuilding with whitelisted_files" am: 70b0162472 am: d54b9ceacc
Change-Id: I28ed01457dc80a105937fca5dd4a2fb07bb20e37
2020-01-29 02:22:09 +00:00
Dan Willemsen
d54b9ceacc Merge "Fix rebuilding with whitelisted_files"
am: 70b0162472

Change-Id: I68a8fe22d74a2b7220fa11f76b573de5cce121ed
2020-01-28 18:04:31 -08:00
Treehugger Robot
70b0162472 Merge "Fix rebuilding with whitelisted_files" 2020-01-29 01:54:06 +00:00
Automerger Merge Worker
48af2f59c4 Merge "Follow input changes to proptools.CloneEmptyProperties" am: 0326e19b49 am: 45bf16fa1e
Change-Id: Ic4a96880a6e4a5e6183c64de3d527dd80c74f7e2
2020-01-29 01:39:51 +00:00
Colin Cross
45bf16fa1e Merge "Follow input changes to proptools.CloneEmptyProperties"
am: 0326e19b49

Change-Id: Ic7a9c16c88c3e4983480b48eb353b307137641bd
2020-01-28 17:20:51 -08:00
Treehugger Robot
0326e19b49 Merge "Follow input changes to proptools.CloneEmptyProperties" 2020-01-29 01:13:53 +00:00
Automerger Merge Worker
78390b63ad Merge "bpfix: remove hidl_interface types" am: ec1339230b am: 7600d36807
Change-Id: I850289ae88acb8922c03194af473841eb82f08a1
2020-01-29 01:02:07 +00:00
Automerger Merge Worker
7e785a4708 Add AUTO_UNINITIALIZE as another option for trivial initialization. am: 797e1959e3 am: 5cbb2c9c4e
Change-Id: I387b0d351cf441ba22de4a67443a2776c95c5842
2020-01-29 01:01:59 +00:00
Steven Moreland
7600d36807 Merge "bpfix: remove hidl_interface types"
am: ec1339230b

Change-Id: I14c89fcc4e3697e44d2ac24d11f44c79aa19cad0
2020-01-28 16:45:05 -08:00
Treehugger Robot
ec1339230b Merge "bpfix: remove hidl_interface types" 2020-01-29 00:43:13 +00:00
Stephen Hines
5cbb2c9c4e Add AUTO_UNINITIALIZE as another option for trivial initialization.
am: 797e1959e3

Change-Id: I100cd72e45ffbce124202cf400ef947b3f62a7c1
2020-01-28 16:41:00 -08:00
Dan Willemsen
81e43c5994 Fix rebuilding with whitelisted_files
All commands must produce their output files, or they'll trigger
rebuilds the next build.

Test: m com.android.apex.cts.shim.v3; repeat; "ninja: nothing to do"
Change-Id: If30e9d90ce3efc0689cd04ac62cc8207f3a38dd5
2020-01-28 15:40:19 -08:00
Stephen Hines
797e1959e3 Add AUTO_UNINITIALIZE as another option for trivial initialization.
This lets us test uninitialized variables even if we change the defaults
for -ftrivial-auto-var-init.

Bug: 131390872
Test: AUTO_UNINITIALIZE=true m
Change-Id: I2b4473a0547dc9c4d9f081d8af2d283f17f66f7a
2020-01-28 14:43:11 -08:00
Automerger Merge Worker
419acf8992 Merge "Add additional variables to ninja variable whitelist" am: 55f3001447 am: 935c850802
Change-Id: I5421262e43857684fe79173a023ecbc16fd87a48
2020-01-28 21:13:23 +00:00
Automerger Merge Worker
935c850802 Merge "Add additional variables to ninja variable whitelist" am: 55f3001447
Change-Id: I07caef1498c4d8ce2dc4a75cbc28878db753995d
2020-01-28 20:59:09 +00:00
Treehugger Robot
55f3001447 Merge "Add additional variables to ninja variable whitelist" 2020-01-28 20:40:31 +00:00
Colin Cross
43e789d667 Follow input changes to proptools.CloneEmptyProperties
Test: m checkbuild
Change-Id: I1fd53d03722d134009f7ed663f05bd6dc5980dd1
2020-01-28 12:17:06 -08:00
Automerger Merge Worker
a171ec4e95 Merge "Add support for experimentally enabling RBE support on specific rules." am: 5e0dbe4e3e am: 205edb5da3
Change-Id: Ie21de541e9209885fcf30f4f0faf425a09d6ac15
2020-01-28 20:16:38 +00:00
Automerger Merge Worker
205edb5da3 Merge "Add support for experimentally enabling RBE support on specific rules." am: 5e0dbe4e3e
Change-Id: Ie168aaa15fb183a8b732c0a6f757dce8698c27cb
2020-01-28 20:07:56 +00:00
Ramy Medhat
5e0dbe4e3e Merge "Add support for experimentally enabling RBE support on specific rules." 2020-01-28 19:49:05 +00:00
Automerger Merge Worker
a00c9382d3 Merge "License info for APEXes are correctly gathered" am: 76fde9212a am: 19f69e2fdd
Change-Id: Ie614524607b082bdb06da6bf690827d2c985d8aa
2020-01-28 19:20:06 +00:00
Jiyong Park
19f69e2fdd Merge "License info for APEXes are correctly gathered"
am: 76fde9212a

Change-Id: I86d447e55f13ca6ce798b662c812f9201bb77fa8
2020-01-28 11:04:28 -08:00
Treehugger Robot
76fde9212a Merge "License info for APEXes are correctly gathered" 2020-01-28 18:56:47 +00:00
Kousik Kumar
0f095e1e65 Add additional variables to ninja variable whitelist
These variables control whether we accept cached-results / not and
whether we should update the cache with locally executed results or not.
I need accpet-cached whitelisted to purge the the RBE cache for the
invalid cache entry we have set for the failure we say yesterday.

Bug: b/148387048

Change-Id: I7344fc083f82e0b7bc11084376a267d19cf30bb8
2020-01-28 10:56:04 -08:00
Automerger Merge Worker
ab4c753ac7 Merge "Fix --boot-image argument in dex2oat command for boot image extension." am: 911083e3e1 am: 00cc7b0b4d
Change-Id: I2a175b88063ec5cdbd8aa3f334453150902a2d2a
2020-01-28 17:45:09 +00:00
Ramy Medhat
8ea054a81e Add support for experimentally enabling RBE support on specific rules.
This CL adds RBE support to javac, r8, and d8 rules which is only
enabled if respective environment variables are set.

Test: an aosp_crosshatch build with and without the new variables.
Change-Id: Ic82f3627944f6a5ee7b9f3228170c2709b1bfcb8
2020-01-28 12:42:47 -05:00
Ulyana Trafimovich
00cc7b0b4d Merge "Fix --boot-image argument in dex2oat command for boot image extension."
am: 911083e3e1

Change-Id: I11c4bedcf0ca964f412d19cb9152eb94ca2fc5b1
2020-01-28 09:20:47 -08:00
Jiyong Park
19972c7935 License info for APEXes are correctly gathered
This change fixes a bug that license info for non-flattened APEXes are
not captured in /system/etc/NOTICE.xml.gz file. For non-flatted APEXes,
we have been creating NOTICE.html.gz file by concatenating all the
license infos of the modules that contributes to the APEX and embedding
the file into the asset directory of the APEX. Then at runtime, the info
is shown through the "Google Play System Update Licenses" UI. However,
this was problematic because the UI only shows license info for the
Google-signed APEXes, leaving OEM-signed APEXes (a.k.a. optional
modules).

The problem is now fixed by associating a merged license file with each
APEX and exporting them to Make, so that the merged license files are
included in the partition level /system/etc/NOTICE.xml.gz file
regardless of whether the APEX is a Google-signed one or not.

This also fixes a bug that license info entries are created for the
runtime paths /apex/<apex_name>/<path_to_a_file>, which is not necessary
as they are already included in the license info of the containing APEX.

Bug: N/A
Test: Go to Settings->About Phone->Legal information and check
that a) /system/apex/*.apex files are shown and b) /apex/<apex_name>/*
files are not shown

Change-Id: I2c25c803b6a4c39b24bb3f724502699382fab50c
2020-01-28 17:20:45 +00:00
Ulyana Trafimovich
911083e3e1 Merge "Fix --boot-image argument in dex2oat command for boot image extension." 2020-01-28 17:04:38 +00:00
Ulya Trafimovich
b0a2d37dcb Fix --boot-image argument in dex2oat command for boot image extension.
The primary image name should be "boot.art" in case of
"boot-framework.art", and "apex.art" in case of "apex-framework.art".
Although "boot.art" and "apex.art" are identical binaries, dex2oat
has hard-coded logic based on the image name.

This has been broken since boot image extension has been enabled for
JIT-zygote config in CL I5493e575ebf90bad1d5ad2850004d54590bbc079.

Test: compare boot-framework.art and apex-framework.art,
  they were identical before this CL, and differ after this CL.

Test: JIT-zygote config boots, steps 1-2:

  1. Temporarily enable Jit zygote in the product device config (in
    this 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. Build and flash:
    $ lunch aosp_walleye-userdebug && m \
    && adb reboot bootloader && fastboot flashall -w

Change-Id: I98de271852ecc33feb9fd4c9b0addf0feba01856
2020-01-28 14:42:41 +00:00
Automerger Merge Worker
635e0adf7c Remove unnecessary symlink for non-flattend APEXes am: 7aa3f76696 am: 3afe2c13a0
Change-Id: I675329144ed97208a4e9e9421116b6a2833bb2ee
2020-01-28 13:15:01 +00:00
Jiyong Park
3afe2c13a0 Remove unnecessary symlink for non-flattend APEXes
am: 7aa3f76696

Change-Id: I4699574214c1a146b32385eff5260b28275ecf9b
2020-01-28 05:04:28 -08:00
Jiyong Park
7aa3f76696 Remove unnecessary symlink for non-flattend APEXes
This change fixes a bug that symlinks to the system partition are
created in /system/apex/<apex_name> directories even when the APEXes are
non-flattened. The symlinks are needed only for flattened APEX (of
course regardless of whether the APEX is a primary one or not).

Bug: N/A
Test: examine /system/apex directory manually
Change-Id: I00bb1423d0a2497408f05e49767b42437210bab8
2020-01-28 16:51:34 +09:00
Automerger Merge Worker
0b8e89bb23 Merge "If input zip file cannot opened, print its name." am: 7c78b3c98e am: 865f0d8900
Change-Id: I93b7eafa28a3857f3dd89f469c8ed6dbf0c087a6
2020-01-28 02:08:52 +00:00
Sasha Smundak
865f0d8900 Merge "If input zip file cannot opened, print its name."
am: 7c78b3c98e

Change-Id: Ia0903ee49082ebf9e59c7eb3be5b922151fea2ef
2020-01-27 17:59:36 -08:00
Treehugger Robot
7c78b3c98e Merge "If input zip file cannot opened, print its name." 2020-01-28 01:48:32 +00:00
Automerger Merge Worker
be91dedf1c Merge "Abstract sdk_version string using sdkSpec type" am: 057dd35669 am: 6ca47f29ce
Change-Id: Ic4d2b65d8a7d0d4b9b8252272f06418501917955
2020-01-28 00:47:02 +00:00
Jiyong Park
6ca47f29ce Merge "Abstract sdk_version string using sdkSpec type"
am: 057dd35669

Change-Id: If94bbf31c3d6090b7c21e31beff8bd372c65acc3
2020-01-27 16:28:47 -08:00
Treehugger Robot
057dd35669 Merge "Abstract sdk_version string using sdkSpec type" 2020-01-28 00:07:37 +00:00
Automerger Merge Worker
581f6051b2 Merge "Simplify vendor conditionals" am: b7ec426e01 am: aad46116be
Change-Id: I9793fd0a960ecd845038581015410c55d402cd5c
2020-01-27 19:36:30 +00:00
Colin Cross
aad46116be Merge "Simplify vendor conditionals"
am: b7ec426e01

Change-Id: I0ffd0be502138fb7e8e28e90f7ac058f78f1c7c4
2020-01-27 11:19:02 -08:00
Colin Cross
b7ec426e01 Merge "Simplify vendor conditionals" 2020-01-27 19:03:23 +00:00
Automerger Merge Worker
546538926f Merge changes from topic "revert-1211982-dex2oat-soong-dep-LLLKNULXYJ" am: 699cf17f53 am: 90e753d47e
Change-Id: If381077ad9c319b7c3f3f16881f6de4da1c8ee0c
2020-01-27 15:23:32 +00:00
Martin Stjernholm
90e753d47e Merge changes from topic "revert-1211982-dex2oat-soong-dep-LLLKNULXYJ"
am: 699cf17f53

Change-Id: I5a7f64c6e3888d894b9db9e6db939383adf9809f
2020-01-27 07:10:20 -08:00
Martin Stjernholm
699cf17f53 Merge changes from topic "revert-1211982-dex2oat-soong-dep-LLLKNULXYJ"
* changes:
  Revert "Separate dexpreopt.GlobalSoongConfig to allow independen..."
  Revert "Move the Once cache for dexpreopt.GlobalConfig into the ..."
  Revert "Get the dex2oat host tool path from module dependency on..."
2020-01-27 13:47:31 +00:00
Hans Boehm
e4b5342d43 Revert "Separate dexpreopt.GlobalSoongConfig to allow independen..."
Revert submission 1211982-dex2oat-soong-dep

Reason for revert: Build failures. See b/148312086.

Reverted Changes:
Ibc427a9a8: Make dex2oat(d) visible for use as implicit dexpre...
I71df11c1e: Move the Once cache for dexpreopt.GlobalConfig int...
I38317f2d5: Get the dex2oat host tool path from module depende...
I440a09dba: Separate dexpreopt.GlobalSoongConfig to allow inde...

Bug: 148312086
Bug: 145934348
Exempt-From-Owner-Approval: Plain revert
Change-Id: Ice3990225635a737e49e9aed7373f06516fccea3
2020-01-27 13:44:24 +00:00
Hans Boehm
453bf09853 Revert "Move the Once cache for dexpreopt.GlobalConfig into the ..."
Revert submission 1211982-dex2oat-soong-dep

Reason for revert: Build failures. See b/148312086.

Reverted Changes:
Ibc427a9a8: Make dex2oat(d) visible for use as implicit dexpre...
I71df11c1e: Move the Once cache for dexpreopt.GlobalConfig int...
I38317f2d5: Get the dex2oat host tool path from module depende...
I440a09dba: Separate dexpreopt.GlobalSoongConfig to allow inde...

Bug: 148312086
Bug: 145934348
Exempt-From-Owner-Approval: Plain revert
Change-Id: I6b656afb5feaad70d958b9d38b6c6eab7b03fba1
2020-01-27 13:44:03 +00:00