Commit Graph

19324 Commits

Author SHA1 Message Date
Automerger Merge Worker
27efc54be4 Merge changes from topic "dex2oat-soong-dep" am: cf52e102ce am: fe568ba2a1 am: 1d1c492d20
Change-Id: I4797dc2b8837c1d982dd324aef619354fb61934e
2020-01-25 03:37:03 +00:00
Automerger Merge Worker
ad00cd0fcc Move the Once cache for dexpreopt.GlobalConfig into the dexpreopt package. am: dae8a80426 am: 0064a8888e am: 443178189c
Change-Id: I88bb622216b39dbe45c79deedf602042267ad632
2020-01-25 03:37:01 +00:00
Automerger Merge Worker
2ca3894edc Separate dexpreopt.GlobalSoongConfig to allow independent caching of it. am: be9d0d21d1 am: 852db0c1da am: 8e761f91c8
Change-Id: Ibf451ceb57c5770727ee1674634ef4d37e486213
2020-01-25 03:36:58 +00:00
Automerger Merge Worker
1d1c492d20 Merge changes from topic "dex2oat-soong-dep" am: cf52e102ce am: fe568ba2a1
Change-Id: Ie691e8f65110d81cf80779600b29a640e2f0588f
2020-01-25 03:22:20 +00:00
Automerger Merge Worker
443178189c Move the Once cache for dexpreopt.GlobalConfig into the dexpreopt package. am: dae8a80426 am: 0064a8888e
Change-Id: Ic9a3af4b8d004d36b791a76b61060be111e33ac6
2020-01-25 03:22:18 +00:00
Automerger Merge Worker
8e761f91c8 Separate dexpreopt.GlobalSoongConfig to allow independent caching of it. am: be9d0d21d1 am: 852db0c1da
Change-Id: I50b67ddf2297e1a16f5f4cce7cc5c6f8fc7a7975
2020-01-25 03:22:16 +00:00
Martin Stjernholm
fe568ba2a1 Merge changes from topic "dex2oat-soong-dep"
am: cf52e102ce

Change-Id: I5cda6d0f9ac0928e74fb20e93ee508cfc3f74419
2020-01-24 19:08:08 -08:00
Martin Stjernholm
0064a8888e Move the Once cache for dexpreopt.GlobalConfig into the dexpreopt package.
am: dae8a80426

Change-Id: I291349b8f05d977edc467a3e2f5adb78bbf94d64
2020-01-24 19:07:53 -08:00
Martin Stjernholm
852db0c1da Separate dexpreopt.GlobalSoongConfig to allow independent caching of it.
am: be9d0d21d1

Change-Id: Ic4f913054711733c55808041044d5f498b05cdb6
2020-01-24 19:07:36 -08:00
Automerger Merge Worker
fa9713dd6e Merge changes from topics "board_use_recovery_as_root_soong", "ramdisk" am: a8c82cc218 am: 1b39c5ee16 am: 488f2c7e6c
Change-Id: Ie0d4086b419ad1c4b113ef3a4a1883894301f23f
2020-01-25 01:14:24 +00:00
Automerger Merge Worker
2b4893b669 Add target.ramdisk am: cf4832c8bc am: 0e4b401dd0 am: 7bfa6b0a56
Change-Id: I9a43e57ee9fa173fe80633e7974b74c7d4149a2a
2020-01-25 01:14:19 +00:00
Automerger Merge Worker
95b7ff6362 Ramdisk modules install to correct location am: 82db735fbc am: a9c9fdf5d3 am: 95d247d8f5
Change-Id: I646ef0e9489f2b35a54415b0d4ff31ec78000888
2020-01-25 01:14:15 +00:00
Automerger Merge Worker
7c6b9aa0f4 Add ramdisk image. am: 1b3348d50a am: 45fd8b4547 am: f9e51442b6
Change-Id: Icfa7eaeaa70bc7380a01b33c110f74ec783c8b4d
2020-01-25 01:14:09 +00:00
Automerger Merge Worker
488f2c7e6c Merge changes from topics "board_use_recovery_as_root_soong", "ramdisk" am: a8c82cc218 am: 1b39c5ee16
Change-Id: I1fa0d3b4686cf2420bf1f8b4c41234be38bd9664
2020-01-25 00:59:32 +00:00
Automerger Merge Worker
7bfa6b0a56 Add target.ramdisk am: cf4832c8bc am: 0e4b401dd0
Change-Id: I6aefd5f43c6bfda13d2846ffefdcf7dd989ff2d5
2020-01-25 00:59:31 +00:00
Automerger Merge Worker
95d247d8f5 Ramdisk modules install to correct location am: 82db735fbc am: a9c9fdf5d3
Change-Id: Ifa0583b1ea35960bdde1451ca4f886afd2b4591f
2020-01-25 00:59:26 +00:00
Automerger Merge Worker
f9e51442b6 Add ramdisk image. am: 1b3348d50a am: 45fd8b4547
Change-Id: I5ce7c896fcb0f042d039ca62cf82131e8563efcb
2020-01-25 00:59:19 +00:00
Treehugger Robot
cf52e102ce Merge changes from topic "dex2oat-soong-dep"
* changes:
  Get the dex2oat host tool path from module dependency on the binary module.
  Move the Once cache for dexpreopt.GlobalConfig into the dexpreopt package.
  Separate dexpreopt.GlobalSoongConfig to allow independent caching of it.
2020-01-25 00:38:19 +00:00
Yifan Hong
1b39c5ee16 Merge changes from topics "board_use_recovery_as_root_soong", "ramdisk"
am: a8c82cc218

Change-Id: Id7fed227ae58b1f987104c448d108c4a5c45ee4b
2020-01-24 16:34:08 -08:00
Yifan Hong
0e4b401dd0 Add target.ramdisk
am: cf4832c8bc

Change-Id: Iffaa86779dc03939bc3e94f6fba53c5b9f6dbbbb
2020-01-24 16:33:45 -08:00
Yifan Hong
a9c9fdf5d3 Ramdisk modules install to correct location
am: 82db735fbc

Change-Id: I36abb4def08d4b1ce463ad18e1d0ff4099985d8a
2020-01-24 16:33:17 -08:00
Yifan Hong
45fd8b4547 Add ramdisk image.
am: 1b3348d50a

Change-Id: I9bf85d8119a970b0526a13b6a7e251f6de307929
2020-01-24 16:32:50 -08:00
Yifan Hong
a8c82cc218 Merge changes from topics "board_use_recovery_as_root_soong", "ramdisk"
* changes:
  libatomic / libgcc_stripped: ramdisk_available
  Add target.ramdisk
  Ramdisk modules install to correct location
  Add ramdisk image.
2020-01-24 22:39:41 +00:00
Martin Stjernholm
dae8a80426 Move the Once cache for dexpreopt.GlobalConfig into the dexpreopt
package.

Preparation for a future CL that will need to get the make-written
GlobalConfig from within dexpreopt.

Also rename the Load*Config functions to Parse*Config, since they don't
actually load the config files anymore.

Bug: 145934348
Test: m
Change-Id: I71df11c1e042ca8135d273a7263e9539ea3cd68f
2020-01-24 22:18:42 +00:00
Martin Stjernholm
335d596384 Get the dex2oat host tool path from module dependency on the binary
module.

This uses the Once cache for GlobalSoongConfig to propagate the dex2oat
path from a module dependency to the singletons (both the one that
writes out dexpreopt_soong.config and the one that creates the
dexpreopted boot images). Unless dexpreopting is disabled altogether
through DisablePreopt in dexpreopt.config, that means:

- We must ensure at least one module registers a dex2oat tool
  dependency and resolves a GlobalSoongConfig using it, or else the
  singletons fail. That means we litter dex2oat dependencies in java
  modules even when they won't get dexpreopted and hence don't really
  need them.

- We still assume there's at least one java_library or android_app in
  the build.

Bug: 145934348
Test: m
  (check that out/soong/dexpreopt_soong.config points to dex2oatd64)
Test: env USE_DEX2OAT_DEBUG=false m
  (check that out/soong/dexpreopt_soong.config points to dex2oat)
Test: env OUT_DIR=out-tools prebuilts/build-tools/build-prebuilts.sh
  on the aosp-build-tools branch
Change-Id: I38317f2d5e5cf6822f87daae25745767c8a3656c
2020-01-24 22:18:42 +00:00
Martin Stjernholm
be9d0d21d1 Separate dexpreopt.GlobalSoongConfig to allow independent caching of
it.

Introduce a Once cache for GlobalSoongConfig to allow it to get binary
tool paths from ordinary module dependencies (coming in a future CL)
that are then reused in singletons.

Bug: 145934348
Test: m
Change-Id: I440a09dba7d337965a196527566b0966a18e3653
2020-01-24 22:09:54 +00:00
Automerger Merge Worker
4efd8ba93c Do not remove RRO resources am: f0f747c949 am: 033eeada51 am: 3643cd99e7
Change-Id: I64254d6a94d49311da61022bc5a744ac26632bbf
2020-01-24 21:36:19 +00:00
Automerger Merge Worker
3643cd99e7 Do not remove RRO resources am: f0f747c949 am: 033eeada51
Change-Id: Ic202422ca73d0d12751c391da47f2e6c9efbd539
2020-01-24 21:24:38 +00:00
Jaewoong Jung
033eeada51 Do not remove RRO resources
am: f0f747c949

Change-Id: I18ddd4f03f4f2500f3ac7c1c4b374d3bf081bf54
2020-01-24 13:13:30 -08:00
Jaewoong Jung
f0f747c949 Do not remove RRO resources
Resource configs should not be deduped when building RROs since it
would be impossible to override some resource configs with the same
value as the default config. Also, aapt2 removes resources that do not
have default configurations. If an overlay attempts to overlay a
non-default configuration without overlaying the default, the resource
will be removed and the value will not be overlaid at all.

Bug: 146227008
Fixes: 119811120
Test: app_test.go
Change-Id: I834a58b18d1e74a0f6b3de3d0523009788787e42
2020-01-24 10:35:52 -08:00
Automerger Merge Worker
5f1bcf4b2c Merge "Fix symlinks to system libs for flattened apex" am: 8c94763bf7 am: e345c2a45d am: 7252e198d8
Change-Id: I89c972f9e96197c9b877c9d40c51ba0780ff94f2
2020-01-24 09:15:05 +00:00
Automerger Merge Worker
7252e198d8 Merge "Fix symlinks to system libs for flattened apex" am: 8c94763bf7 am: e345c2a45d
Change-Id: I11a31140ed79356bf01cbf22cc5d4ba1bd31b09e
2020-01-24 09:01:25 +00:00
Automerger Merge Worker
e345c2a45d Merge "Fix symlinks to system libs for flattened apex" am: 8c94763bf7
Change-Id: I44692e47fdabd2038f33ab4338f3e315fc48e742
2020-01-24 08:40:02 +00:00
Treehugger Robot
8c94763bf7 Merge "Fix symlinks to system libs for flattened apex" 2020-01-24 08:32:05 +00:00
Automerger Merge Worker
1ae81e980a Merge "Add runtime_resource_overlay." am: 84f71af41c am: 51e926c45d am: 8f84cbc441
Change-Id: Ia827ca892800111c8530d617c2275f0b8ba62776
2020-01-24 01:01:36 +00:00
Automerger Merge Worker
8f84cbc441 Merge "Add runtime_resource_overlay." am: 84f71af41c am: 51e926c45d
Change-Id: I628c969aeed58f65aacdc16521a35c8a2831ff93
2020-01-24 00:44:02 +00:00
Automerger Merge Worker
51e926c45d Merge "Add runtime_resource_overlay." am: 84f71af41c
Change-Id: Ie16965ef18f5723f8e76bb63a1a1a1c53117a242
2020-01-24 00:32:05 +00:00
Treehugger Robot
84f71af41c Merge "Add runtime_resource_overlay." 2020-01-24 00:23:42 +00:00
Jaewoong Jung
9befb0c326 Add runtime_resource_overlay.
Fixes: 119811120
Test: app_test.go
Test: Converted and built IconPackFilledSystemUIOverlay
Change-Id: I71841148c25f820ba829f751a201d2c771c8bd20
2020-01-23 14:24:41 -08:00
Automerger Merge Worker
3f760d9a74 Merge changes from topic "filtershard" am: c61b38904e am: 0a110390f4 am: d07988030a
Change-Id: Ide71eef83c9667c63aa0e8e5a4482d353aa85aec
2020-01-23 22:10:02 +00:00
Automerger Merge Worker
d07988030a Merge changes from topic "filtershard" am: c61b38904e am: 0a110390f4
Change-Id: I2480fb47aea969e421b9698592e88ad526ebbfea
2020-01-23 21:57:37 +00:00
Automerger Merge Worker
0a110390f4 Merge changes from topic "filtershard" am: c61b38904e
Change-Id: Ie6e773331ff3ccdd18474b0b53e89381009ef604
2020-01-23 21:46:24 +00:00
Colin Cross
c61b38904e Merge changes from topic "filtershard"
* changes:
  Pass desired size proptools.FilterPropertyStructSharded
  Do a better job removing tags from arch structs
  Split the runtime arch property structs into 3
2020-01-23 21:26:39 +00:00
Jooyung Han
75de261056 Fix symlinks to system libs for flattened apex
Symlinks to system libs should be created for flattened apex regardless
that it is primary or not.

For example, GSI installs non-primary flattened apexes as well. These
flattened (non-primary) apexes could be activated on non-updatable
devices.

Bug: 148195518
Test: GSI runs on P
Change-Id: I238b226473d923e03280b1b28dd0d5d1f77ae74a
2020-01-24 02:02:45 +09:00
Ivailo Karamanolev
5650166b98 Merge "Add android.hardware.light-ndk_platform to vndkMustUseVendorVariantList" 2020-01-23 16:05:08 +00:00
Automerger Merge Worker
7ae23db1e5 Merge "Revert "Revert "apex_vndk uses vendor variants only""" am: 7b2970536e am: 4e5f39e9d8 am: d2293a5d6c
Change-Id: I75f3c5fbf97a422a15deebf9a07514a27517b88c
2020-01-23 13:50:46 +00:00
Automerger Merge Worker
d2293a5d6c Merge "Revert "Revert "apex_vndk uses vendor variants only""" am: 7b2970536e am: 4e5f39e9d8
Change-Id: Ifb3d053e49a3efff6c8b2ef7a0f4afde29bb96d7
2020-01-23 13:39:18 +00:00
Jooyung Han
4e5f39e9d8 Merge "Revert "Revert "apex_vndk uses vendor variants only"""
am: 7b2970536e

Change-Id: Icb3ca6dbda8ec0530d9bf58ce2f212908e99d216
2020-01-23 05:26:08 -08:00
Treehugger Robot
7b2970536e Merge "Revert "Revert "apex_vndk uses vendor variants only""" 2020-01-23 13:16:52 +00:00
Automerger Merge Worker
4acb8f82c8 Merge "For JIT-zygote config, add "apex" boot image files to the ART apex." am: c18235cb86 am: 4504c82639 am: e663326c09
Change-Id: Ifeef80c0aef719076ec869423906228b4ced26f3
2020-01-23 12:32:27 +00:00