Commit graph

49975 commits

Author SHA1 Message Date
SzuWei Lin
ce383df8c9 Merge "Apply skip mounting product and other partitions in GSI" am: 00d74cc938 am: 2e39e68d07
am: eb8b11b782

Change-Id: I13520ebc3829ffece53315aa9dc6a1f446dd4618
2018-12-19 03:22:14 -08:00
SzuWei Lin
eb8b11b782 Merge "Apply skip mounting product and other partitions in GSI" am: 00d74cc938
am: 2e39e68d07

Change-Id: I5e2b28a8819a494fa56e2762e05b0babc5597cb7
2018-12-19 03:17:07 -08:00
SzuWei Lin
2e39e68d07 Merge "Apply skip mounting product and other partitions in GSI"
am: 00d74cc938

Change-Id: I63b9b3c32ae3d4c557ce9fcd6f8bc0e611dbeba2
2018-12-19 03:12:00 -08:00
Treehugger Robot
00d74cc938 Merge "Apply skip mounting product and other partitions in GSI" 2018-12-19 11:05:00 +00:00
Nicolas Geoffray
d74b7464bd Merge "Fix build time preopt with shared library uses." am: c857ed2acd am: fef60cdd1d
am: ba7aaaf8bb

Change-Id: Ifb0af516cd1ca49cbd574de5afd41358d1caf806
2018-12-19 01:09:29 -08:00
Nicolas Geoffray
ba7aaaf8bb Merge "Fix build time preopt with shared library uses." am: c857ed2acd
am: fef60cdd1d

Change-Id: I83004e1ab928baf4a04483e49a33b887869675ba
2018-12-19 01:01:21 -08:00
Nicolas Geoffray
fef60cdd1d Merge "Fix build time preopt with shared library uses."
am: c857ed2acd

Change-Id: I8ca36bef714dd437af12b4868369f74773b8c230
2018-12-19 00:51:47 -08:00
Justin Yun
66e573fb1d Merge "Remove libunwind from VNDK" am: a4fd5e72a4 am: cf50281a7d
am: d5c510b78d

Change-Id: Ic27600aecec23f3ee934b8bf1f0e78c23bdc9743
2018-12-19 00:43:29 -08:00
Nicolas Geoffray
c857ed2acd Merge "Fix build time preopt with shared library uses." 2018-12-19 08:37:01 +00:00
Justin Yun
d5c510b78d Merge "Remove libunwind from VNDK" am: a4fd5e72a4
am: cf50281a7d

Change-Id: Ic4a63f3a93116287443da640ac7d764bb8e7ac2f
2018-12-19 00:34:05 -08:00
Justin Yun
cf50281a7d Merge "Remove libunwind from VNDK"
am: a4fd5e72a4

Change-Id: I7dfc8cbf2ca43b7d0097be336e82a8490b2da188
2018-12-19 00:18:32 -08:00
SzuWei Lin
2d541f35cd Apply skip mounting product and other partitions in GSI
Uses skip_mount.cfg for `init` to skip mounting product and
product_service paritions in GSI. The patch also removes
the un-mount in `init.gsi.rc`.

With this patch, a device with flashing GSI will not use the
content in product/prodcut_service partitions on the device
and will always use the content under /system/product in GSI.

The patch also rename the target/product/vndk to
target/product/gsi.

Bug: 120208657
Bug: 117246558
Test: Boot blueline master/P with flashing aosp_arm64-userdebug
Test: /product and /product_service should be symbolic links
Change-Id: Idc9c60e5a05b3d90fc4ab64b0ac000571849b19b
2018-12-19 14:42:27 +08:00
Treehugger Robot
a4fd5e72a4 Merge "Remove libunwind from VNDK" 2018-12-19 04:16:26 +00:00
Justin Yun
c80ae22e44 Remove libunwind from VNDK
libunwind has no dependency on vendor modules.
Remove it from VNDK list.

Bug: 120948701
Test: build and boot
Change-Id: Ic4c0080fea7da021334aaa1a81b3b7377b06f62f
2018-12-19 00:57:17 +00:00
Colin Cross
c3f231e0de Merge "Add missing dependency on common javalib.jar" am: 81e29e0969 am: 61311e0ce1
am: 33bf2a06ce

Change-Id: I9bbba76f1927a400b120f32f177a188a68508580
2018-12-18 13:47:01 -08:00
Colin Cross
33bf2a06ce Merge "Add missing dependency on common javalib.jar" am: 81e29e0969
am: 61311e0ce1

Change-Id: Ie310220c761f4a19f35ff610a5d96dd5bd30724d
2018-12-18 13:38:18 -08:00
Colin Cross
61311e0ce1 Merge "Add missing dependency on common javalib.jar"
am: 81e29e0969

Change-Id: I244141ce9bcc2664dd2339630ac803aebe163cda
2018-12-18 13:34:09 -08:00
Treehugger Robot
81e29e0969 Merge "Add missing dependency on common javalib.jar" 2018-12-18 21:17:07 +00:00
Colin Cross
db98fd6a4f Merge "Don't install boot.art when WITH_DEXPREOPT is false" am: 632d154393 am: 378a702655
am: 73d63bee86

Change-Id: Ic9d6ad2fccf2c4b978ea3a6d3385af94f5550b30
2018-12-18 12:28:50 -08:00
Anton Hansson
25d1d97ceb [automerger skipped] Merge "Allow mainline_arm64 to have product contents" am: 632ee3dee8 am: 0fdc4adae9
am: c8dd0b6eac  -s ours

Change-Id: I6ee2baf5cac6224278d498bb92a540b7fa8fed1c
2018-12-18 12:09:51 -08:00
Colin Cross
73d63bee86 Merge "Don't install boot.art when WITH_DEXPREOPT is false" am: 632d154393
am: 378a702655

Change-Id: Ib5bce68ec5d07f017677617a5b7988b8e5e6b546
2018-12-18 11:54:05 -08:00
Anton Hansson
c8dd0b6eac Merge "Allow mainline_arm64 to have product contents" am: 632ee3dee8
am: 0fdc4adae9

Change-Id: Iedd3b797967b02f85562cb3ad4cd30af4196a541
2018-12-18 11:40:30 -08:00
Colin Cross
378a702655 Merge "Don't install boot.art when WITH_DEXPREOPT is false"
am: 632d154393

Change-Id: I5913b922f490f63feb4470f296105b622ac966e7
2018-12-18 11:12:02 -08:00
Anton Hansson
0fdc4adae9 Merge "Allow mainline_arm64 to have product contents"
am: 632ee3dee8

Change-Id: I0131b5d2d45603a3185bb3dca8c14eaccf8da608
2018-12-18 11:08:02 -08:00
Colin Cross
54a71e229b Add missing dependency on common javalib.jar
Building $OUT/obj/JAVA_LIBRARIES/core-tests_intermediates/javalib.jar
is no longer updating the common intermediates:
out/target/common/obj/JAVA_LIBRARIES/core-tests_intermediates/javalib.jar
out/target/common/obj/JAVA_LIBRARIES/core-tests_intermediates/classes.jar
after I25163e91886cea6941afa25cdb529ed053278dcb.  Add the missing
dependency on common javalib.jar, which already depends on common
classes.jar.

Bug: 119412419
Bug: 121194944
Test: rm out/target/common/obj/JAVA_LIBRARIES/core-tests_intermediates/classes.jar &&
      m core-tests &&
      ls out/target/common/obj/JAVA_LIBRARIES/core-tests_intermediates/classes.jar

Change-Id: Id463d159e46c82656c364fdb2dbe53f33ee1a103
2018-12-18 11:06:25 -08:00
Nicolas Geoffray
c04f3126f4 Fix build time preopt with shared library uses.
- Handle hidl libraries.
- Handle new shared library encoding.

Test: no mismatch preopt during boot.
bug: 117845483
bug: 111174995
Change-Id: Ie4bca653594c72df2eb2fdd827bc73cfcb76b1d7
2018-12-18 17:33:02 +00:00
Treehugger Robot
632d154393 Merge "Don't install boot.art when WITH_DEXPREOPT is false" 2018-12-18 16:33:59 +00:00
Colin Cross
19fbc1b9e9 Don't install boot.art when WITH_DEXPREOPT is false
Don't create the install rules for boot.art when WITH_DEXPREOPT
is not set to true, which will ensure there is no dependency on
boot.art in a normal build, which matches the behavior before
I25163e91886cea6941afa25cdb529ed053278dcb.

This should fix the Mac build, which never sets WITH_DEXPREOPT
and does not support running dex2oat.

Bug: 119412419
Bug: 121130576
Bug: 121183382
Test: lunch aosp_sailfish-eng && m WITH_DEXPREOPT=false
      files does not depend on out/target/product/sailfish/dex_bootjars/system/framework/arm/boot.art
Change-Id: I39e96b1f35f6808d3007cf1785ec3db89e0decb6
2018-12-18 15:36:36 +00:00
Anton Hansson
72118c5221 Merge "Move SystemUI to handheld_vendor" 2018-12-18 14:54:22 +00:00
Ben Lin
b8af700d1d Merge "cheets: Use wildcard in org.chromium.arc whitelist" 2018-12-18 14:51:06 +00:00
Anton Hansson
632ee3dee8 Merge "Allow mainline_arm64 to have product contents" 2018-12-18 14:35:20 +00:00
Anton Hansson
acb3084aa2 Allow mainline_arm64 to have product contents
The device currently targeted does not have a product partition.
Adding product-specific apps to it therefore trips up the artifact path
check for /system.

Workaround that by whitelisting /system/product/% for now. This should
be removed when the device has the right partitions.

Bug: 110072687
Test: build mainline_arm64
Merged-In: I54175bc51df5dfe82c64f66f255a2cea6ff9b9ab
Change-Id: I54175bc51df5dfe82c64f66f255a2cea6ff9b9ab
2018-12-18 14:34:29 +00:00
Anton Hansson
cbf70886c2 Move SystemUI to handheld_vendor
The app is moving to /product, so doesn't belong in
handheld_system anymore. Note: a handheld_product will
likely be created at a future point in time.

Bug: 110072687
Test: make
Change-Id: Ic2959dd5e218de0fb9c070ba1dd743c57d052234
2018-12-18 10:33:52 +00:00
Anton Hansson
e8bd417c94 Move Settings to handheld_vendor
The app is moving to /product, so doesn't belong in
handheld_system anymore. Note: a handheld_product will
likely be created at a future point in time.

Bug: 110072687
Test: make
Change-Id: I46dc990dfcf4a501c2a362e4ebaa210ba306cee5
2018-12-18 09:57:49 +00:00
Anton Hansson
a2946913ed Allow mainline_arm64 to have product contents
The device currently targeted does not have a product partition.
Adding product-specific apps to it therefore trips up the artifact path
check for /system.

Workaround that by whitelisting /system/product/% for now. This should
be removed when the device has the right partitions.

Bug: 110072687
Test: build mainline_arm64
Change-Id: I54175bc51df5dfe82c64f66f255a2cea6ff9b9ab
2018-12-18 09:57:45 +00:00
Hridya Valsaraju
dede03d4e7 Merge "Relax inode usage estimation slack for DAP right sizing" am: 7cac3adf1a am: 4ace8926ba
am: 3c4d2241e1

Change-Id: Ib3d17934b3fcd96ec426d32193f257c176f0b987
2018-12-17 18:41:13 -08:00
Hridya Valsaraju
3c4d2241e1 Merge "Relax inode usage estimation slack for DAP right sizing" am: 7cac3adf1a
am: 4ace8926ba

Change-Id: I8c2a82dc493dc2c6f9341992b238267f3caf113e
2018-12-17 18:35:57 -08:00
Hridya Valsaraju
4ace8926ba Merge "Relax inode usage estimation slack for DAP right sizing"
am: 7cac3adf1a

Change-Id: I204d87da9a4879f00e332366d792692f7ad8d3c8
2018-12-17 18:31:47 -08:00
Colin Cross
60c745db7b Merge "Move dexpreopting to Soong" am: d73e21ad3b am: 3f9a751cec
am: 3a9c20b373

Change-Id: Ia4bb38b5e017bb39299a7fabfe3e7a321c8c3210
2018-12-17 18:14:00 -08:00
Treehugger Robot
7cac3adf1a Merge "Relax inode usage estimation slack for DAP right sizing" 2018-12-18 02:13:10 +00:00
Colin Cross
3a9c20b373 Merge "Move dexpreopting to Soong" am: d73e21ad3b
am: 3f9a751cec

Change-Id: Idcc76d46ae949f57855d66a0218f6dce96af2094
2018-12-17 18:08:50 -08:00
Colin Cross
3f9a751cec Merge "Move dexpreopting to Soong"
am: d73e21ad3b

Change-Id: I43cfe0bda5e6ea651042ad5d02fadc8d44a9341c
2018-12-17 18:02:52 -08:00
Colin Cross
d73e21ad3b Merge "Move dexpreopting to Soong" 2018-12-18 01:54:32 +00:00
Andrew Chant
5599f0f7fa Merge "Add an extra metadata slot to super[_empty].img." 2018-12-18 00:03:42 +00:00
TreeHugger Robot
cd38d36028 Merge "Add a property used to enable Vulkan as default render pipeline" 2018-12-17 22:26:25 +00:00
David Anderson
212e5dfb53 Add an extra metadata slot to super[_empty].img.
This change excludes retrofit devices from getting a third metadata
slot, until code is in place to correctly upgrade those devices through
fastbootd/update_engine.

Bug: 121149247
Test: lpdump super_empty.img
Change-Id: Id147c42cee93a1f6d61ee0edc9cddc0c0540a279
2018-12-17 13:59:19 -08:00
Colin Cross
6db5b0ea9a Move dexpreopting to Soong
Move the dexpreopting logic into Soong.  Make modules will be
dexpreopted by executing the Soong logic in the standalone
dexpreopt_gen binary, which will generate scripts that will
perform dexpreopting for each module.  Export global configuration
as JSON to $OUT/dexpreopt.config, which will be used by
dexpreopt_gen and Soong, and per-module JSON configuration that
will be used by dexpreopt_gen.

This relands I59b20c931ee3e5a8d35eb30da4148691c5095502,
I39d580999947ee54cfefe875b57a028be5333bd7,
Ie7daa94e107d53eff075ca58dbe721bd9d7fc8c2 and
Ica006a007d112c232311435aaac0c0e476232b67, with a minor
update to match the changes made to dexpreopt_gen arguments
and a fix to correctly keep dexpreopt disabled on mac builds.

Bug: 119412419
Bug: 120273280
Test: no differences to dexpreopt outputs on aosp_sailfish system/,
      only expected changes to dexpreopt outputs on system_other
      (.vdex files for privileged Soong modules no longer incorrectly
      contain .dex contents).
Change-Id: I25163e91886cea6941afa25cdb529ed053278dcb
2018-12-17 13:46:17 -08:00
Colin Cross
ada27155f3 Merge "Remove file named .d created in the source directory" am: b7e7f7c771 am: 8c8eb3db83
am: bc6336ef57

Change-Id: I80c1c54c603869ddc2e42400884810b44301554f
2018-12-17 13:20:28 -08:00
Colin Cross
46041b45ee Merge "Restore reverted CleanSpec" am: 29dddab453 am: d14d5280e3
am: b43e67e079

Change-Id: I6d8856b75314477d9324fcd9b6e1a1961f9b5935
2018-12-17 13:18:33 -08:00
Colin Cross
bc6336ef57 Merge "Remove file named .d created in the source directory" am: b7e7f7c771
am: 8c8eb3db83

Change-Id: If8beba744be53842d996948e6fe160d61812ab5b
2018-12-17 13:15:11 -08:00