Commit Graph

18070 Commits

Author SHA1 Message Date
Automerger Merge Worker
f9e51442b6 Add ramdisk image. am: 1b3348d50a am: 45fd8b4547
Change-Id: I5ce7c896fcb0f042d039ca62cf82131e8563efcb
2020-01-25 00:59:19 +00:00
Yifan Hong
45fd8b4547 Add ramdisk image.
am: 1b3348d50a

Change-Id: I9bf85d8119a970b0526a13b6a7e251f6de307929
2020-01-24 16:32:50 -08: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
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
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
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
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
e663326c09 Merge "For JIT-zygote config, add "apex" boot image files to the ART apex." am: c18235cb86 am: 4504c82639
Change-Id: Icaaece3d8a34eaacb132f23514c5cc76055ccdce
2020-01-23 12:19:57 +00:00
Ulyana Trafimovich
4504c82639 Merge "For JIT-zygote config, add "apex" boot image files to the ART apex."
am: c18235cb86

Change-Id: I7bd45b7d963e612326ebac220582dde4d6c7c3a4
2020-01-23 04:10:06 -08:00
Ulyana Trafimovich
c18235cb86 Merge "For JIT-zygote config, add "apex" boot image files to the ART apex." 2020-01-23 10:27:09 +00:00
Automerger Merge Worker
6db7972481 Merge "Reland "Clean up no-vendor-variant VNDK whitelist"" am: 641e87a02c am: a54fbcbce0
Change-Id: Ia32ba26b805fdbf5c117c24fc3dc42d644a2d28e
2020-01-23 06:31:45 +00:00
Automerger Merge Worker
40cd3da318 Merge "Revert "apex_vndk uses vendor variants only"" am: 7dfb229936 am: cb8a4e39e8
Change-Id: I0506071af73acdb6e0e6d36308756a4fbc1bf9a4
2020-01-23 06:31:39 +00:00
Automerger Merge Worker
7713f3f743 Merge "apex_vndk uses vendor variants only" am: e4226c4d67 am: 65ea3bca11
Change-Id: I959c5046cc7927396769d43d42d17e5e29732270
2020-01-23 06:31:33 +00:00
Vic Yang
a54fbcbce0 Merge "Reland "Clean up no-vendor-variant VNDK whitelist""
am: 641e87a02c

Change-Id: I66403dfb67517f059e2f8682c34a56e571952827
2020-01-22 22:21:32 -08:00
Jooyung Han
cb8a4e39e8 Merge "Revert "apex_vndk uses vendor variants only""
am: 7dfb229936

Change-Id: Ife38d0d0bf93b8570967bc30f61e89266e2a7a3b
2020-01-22 22:20:57 -08:00
Jooyung Han
65ea3bca11 Merge "apex_vndk uses vendor variants only"
am: e4226c4d67

Change-Id: I68624b5fc2233f9b36465eb6d5a84f6da4f0b920
2020-01-22 22:19:34 -08:00
Vic Yang
641e87a02c Merge "Reland "Clean up no-vendor-variant VNDK whitelist"" 2020-01-23 06:07:58 +00:00
Jooyung Han
a57af4adc0 Revert "Revert "apex_vndk uses vendor variants only""
This reverts commit 5df3b11f78.

Reason for revert: re-land with a fix

Fix a broken soong test
Add implicit dependency (libprofile-clang-extra) to make a test pass.

Bug: n/a
Test: m
Change-Id: I0b179199bc032501354f8e24782837453781bd8c
2020-01-23 14:48:29 +09:00
Jooyung Han
7dfb229936 Merge "Revert "apex_vndk uses vendor variants only"" 2020-01-23 05:34:42 +00:00
Jooyung Han
5df3b11f78 Revert "apex_vndk uses vendor variants only"
This reverts commit 559ad01db9.

Reason for revert: broken builds

Change-Id: Ia8a09a2bdbdc8e76f2d4b9eb54e36ccc544e9397
Bug: b/148181875
2020-01-23 05:31:05 +00:00
Treehugger Robot
e4226c4d67 Merge "apex_vndk uses vendor variants only" 2020-01-23 04:47:05 +00:00
Jooyung Han
559ad01db9 apex_vndk uses vendor variants only
VNDK APEX is supposed to contain "vendor" variants of VNDK libraries.
This is different from normal APEXes which have "apex" variants.

Bug: 146758869
Test: build / flash / boot
Change-Id: I5e035678c337334092616b58d2e0e404788a6639
Exempt-From-Owner-Approval: Got ORV, but rebased with resolving merge conflicts.
2020-01-23 04:46:53 +00:00
Automerger Merge Worker
d235fb3d6e Merge "Export KYTHE_KZIP_ENCODING." am: 59ee253b35 am: 1cd3aeb04e
Change-Id: Id537f898ff1b4550b33d4d35ea5214df3e2bc637
2020-01-23 03:51:56 +00:00
Sasha Smundak
1cd3aeb04e Merge "Export KYTHE_KZIP_ENCODING."
am: 59ee253b35

Change-Id: Iccc0243f4304d8887f951afbf54fc523cc230c2c
2020-01-22 19:36:15 -08:00
Colin Cross
b1d8c99e12 Pass desired size proptools.FilterPropertyStructSharded
proptools.FilterPropertyStructSharded now takes a desired max size
of the name.

Fixes: 146234651
Test: all soong tests
Change-Id: Ifa10039e5f55a5d0f4a35172983d43f33af88e93
2020-01-22 18:30:56 -08:00
Colin Cross
b4fecbfef4 Do a better job removing tags from arch structs
Remove more android struct tags from runtime created arch structs
to reduce the size of their names, which hit the 64kB limit in
runtime.StructOf if they are too long.

Bug: 146234651
Test: m checkbuild
Change-Id: I6362765275b93c8932eb0b1abbcb4be47031d9b1
2020-01-22 18:30:56 -08:00
Yifan Hong
1b3348d50a Add ramdisk image.
It is similar to recovery image.
Test: m nothing -j

Change-Id: I11389777c6bfb0c0d73bbb4c70091c1e70f44077
2020-01-22 16:54:18 -08:00
Treehugger Robot
59ee253b35 Merge "Export KYTHE_KZIP_ENCODING." 2020-01-23 00:29:25 +00:00
Automerger Merge Worker
a5486a3ce4 Merge "Add coverage flags for Clang coverage builds." am: b6aeb14150 am: 195ed73e05
Change-Id: Iba5f9f084dcc2364aec33dc0fea42e7e9fe20c55
2020-01-22 22:44:56 +00:00
Automerger Merge Worker
52a5c8a6c4 Merge "Revert "Default to pattern initialization for uninitialized variables."" am: 8aecc11844 am: 20f4f20573
Change-Id: I2f6019a1bc2357ee1cfffcd3eb787bebba7907f6
2020-01-22 22:44:35 +00:00
Oliver Nguyen
195ed73e05 Merge "Add coverage flags for Clang coverage builds."
am: b6aeb14150

Change-Id: If7fc1974a3a930a9f1d610aed1fc1b9864efec32
2020-01-22 14:41:07 -08:00
Sasha Smundak
f77ee745d3 Export KYTHE_KZIP_ENCODING.
Bug: 146224091
Test: manual
Change-Id: I998a51565419b86a9f183c0f3228ce09d7b035c0
2020-01-22 14:41:01 -08:00
Oliver Nguyen
b6aeb14150 Merge "Add coverage flags for Clang coverage builds." 2020-01-22 22:34:35 +00:00
Hadrien Zalek
20f4f20573 Merge "Revert "Default to pattern initialization for uninitialized variables.""
am: 8aecc11844

Change-Id: I03b44e14334e815f32473df92dea1d33b93795f6
2020-01-22 14:27:56 -08:00
Hadrien Zalek
8aecc11844 Merge "Revert "Default to pattern initialization for uninitialized variables."" 2020-01-22 22:16:18 +00:00
Hadrien Zalek
6fecbee4d5 Revert "Default to pattern initialization for uninitialized variables."
This reverts commit fae236f4ee.

Reason for revert: Breaks 32-bit app tests on Cuttlefish
Bug: 148123414

Change-Id: Ieeb0b09e711a55172e6faa0035d1eb84dd6c4471
2020-01-22 21:50:56 +00:00
Ulya Trafimovich
7eebb4f4e8 For JIT-zygote config, add "apex" boot image files to the ART apex.
JIT-zygote boot image was split into primary and framework extension
in CL I5493e575ebf90bad1d5ad2850004d54590bbc079, but that CL forgot to
add JIT-zygote boot image files to the ART apex. Add them now.

Test: Steps 1-3:

  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

  3. Ensure that apex.art and apex-framework.art are mapped in the
    JIT-zygote address space:

    $ adb shell cat /proc/`adb shell ps | grep zygote64 | awk {'print $2'}`/maps | grep apex.art
    6ffde000-70102000 rw-p 00000000 00:00 0                                  [anon:dalvik-/apex/com.android.art/javalib/apex.art]
    701e5000-70262000 rw-p 00000000 00:00 0                                  [anon:dalvik-/apex/com.android.art/javalib/apex.art]
    72715cf000-72715d4000 r--p 000ba000 07:98 93                             /apex/com.android.art/javalib/arm64/apex.art

    $ adb shell cat /proc/`adb shell ps | grep zygote64 | awk {'print $2'}`/maps | grep apex-framework.art
    7084b000-70cc2000 rw-p 00000000 00:00 0                                  [anon:dalvik-/system/framework/apex-framework.art]
    70fd8000-71109000 rw-p 00000000 00:00 0                                  [anon:dalvik-/system/framework/apex-framework.art]
    7271517000-7271526000 r--p 00295000 fc:00 1268                           /system/framework/arm64/apex-framework.art

Change-Id: I985e15de9f38f345ba3e99451c6d9b8e2cb5d698
2020-01-22 15:27:08 +00:00
Automerger Merge Worker
1bb242bb7a Merge "Remove unused java_sdk_library_import properties" am: 0c9c0f045f am: 07e5b368c7
Change-Id: I367e707dfcaf953425ca7f93a6734b8fcb86d70b
2020-01-22 06:25:18 +00:00