Commit Graph

48225 Commits

Author SHA1 Message Date
Mark Salyzyn fb37e0b6a2 Merge "build_image: Increase spare inodes to 12."
am: aa58210dd0

Change-Id: I4ff9d44984e043c88c31be523297330a20c4e12f
2019-01-17 18:19:03 -08:00
Treehugger Robot aa58210dd0 Merge "build_image: Increase spare inodes to 12." 2019-01-18 02:06:46 +00:00
Colin Cross 9cfe03b9d5 Merge changes from topics "hiddenapi-soong", "hostdex_install"
am: d61a1aba36

Change-Id: I1e7a8806821414aa68b7309de79668ee6cd86d68
2019-01-17 15:21:35 -08:00
Colin Cross d61a1aba36 Merge changes from topics "hiddenapi-soong", "hostdex_install"
* changes:
  Move hiddenapi to Soong
  Simplify soong_java_prebuilt.mk and soong_app_prebuilt.mk
2019-01-17 22:53:24 +00:00
Xin Li e2b87fa9be [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190105.001) into master"
am: ab9de0ab6e -s ours
am skip reason: subject contains skip directive

Change-Id: Iec30206046901ce4e87688c4a336c0f26facc6bb
2019-01-17 14:12:56 -08:00
Xin Li 7c28813adf [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190105.001) into master
am: dd1f2cf7de -s ours
am skip reason: subject contains skip directive

Change-Id: Icffd0fd4affa17496d22d3d4e48b2ac68296bfa8
2019-01-17 13:51:04 -08:00
Xin Li ab9de0ab6e Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190105.001) into master" 2019-01-17 21:19:43 +00:00
Mark Salyzyn 60fa99d491 build_image: Increase spare inodes to 12.
Test: builds device with DAP
Change-Id: I816a7da54bbe23d4eb1140ac0d101c0fee175f0a
2019-01-17 11:30:12 -08:00
Colin Cross 49adea3bd8 Move hiddenapi to Soong
Perform hiddenapi CSV generation and dex encoding for Soong modules
in Soong.  This fixes an issue where dexpreopting was happening on
a different jar than was being installed.

Bug: 122856783
Test: m checkbuild
Change-Id: I24a235c63ff62fed7e1af9f2fd17e55b0c1598a5
2019-01-17 10:23:10 -08:00
Colin Cross 83b7bdf765 Simplify soong_java_prebuilt.mk and soong_app_prebuilt.mk
Simplify importing Soong modules into Make by always copying
LOCAL_PREBUILT_MODULE_FILE to LOCAL_BUILT_MODULE, which lets
Soong pick the final output file instead of trying to figure
out which of the various intermediate files should be the
output file.

Also fixes an issue where hostdex modules could attempt to
copy to both $(common_javalib.jar) and $(LOCAL_BUILT_MODULE),
which are the same file for host java modules.

Test: set compile_dex:true on core.platform.api.stubs. no warnings
      of target overriding
Test: m checkbuild

Change-Id: I2e089012436fe8649db82a673d446d1c5a73a731
2019-01-17 10:23:06 -08:00
Nicolas Geoffray f2c2fe0707 Merge "dex_preopt: differentiate between updatable boot jars and non-updatable boot jars."
am: 85437e248d

Change-Id: I922fdc3879c4a39bcfe59f8f6311e47ad44231d0
2019-01-17 10:19:22 -08:00
Nicolas Geoffray 85437e248d Merge "dex_preopt: differentiate between updatable boot jars and non-updatable boot jars." 2019-01-17 18:08:13 +00:00
Tianjie Xu 4046b8f741 Merge "blockimgdiff: selectively convert 'diff' commands to 'new' to reduce stash size"
am: ffc87ac0a7

Change-Id: I38af15ee6b7a6e59017fc89e6f01ce661675b40c
2019-01-17 09:15:41 -08:00
Tianjie Xu ffc87ac0a7 Merge "blockimgdiff: selectively convert 'diff' commands to 'new' to reduce stash size" 2019-01-17 16:54:04 +00:00
Nicolas Geoffray 6ce12f56de dex_preopt: differentiate between updatable boot jars and non-updatable boot jars.
bug: 119868597
Test: m
Change-Id: I2f12ed6f37b629effc30e7b0c3310dc32e5ff4c8
2019-01-17 14:35:41 +00:00
Sundong Ahn c2214aaaff Merge "Change the impl lib name of java_sdk_library"
am: 0a8750b3da

Change-Id: I5a6c118818778d34c24ff609da6884c2efcaedc3
2019-01-17 02:12:38 -08:00
Treehugger Robot 0a8750b3da Merge "Change the impl lib name of java_sdk_library" 2019-01-17 10:01:37 +00:00
Sundong Ahn a9f2ef5ed1 Change the impl lib name of java_sdk_library
The impl lib name of java_sdk_library is changed to {module_name}.jar
instead of {module_name}.impl.jar

Bug: 110404779
Test: m -j
Change-Id: I275cd40e3682640b96425e56698cea770888cbb1
Merged-In: I275cd40e3682640b96425e56698cea770888cbb1
(cherry picked from commit 0372f189ac)
2019-01-17 09:42:57 +09:00
xunchang b6105dcba3 blockimgdiff: selectively convert 'diff' commands to 'new' to reduce stash size
We cannot simultaneously stash more blocks than the size limit imposed by
the cache size. As a result, some 'diff' commands will be inevitably
converted to new. We used to do this conversion blindly when iterating
through the transfer list. This leads to an unintended large package.

In order to choose the right transfers to convert, we calculate the size
of the compressed data, and build a heuristic about the package size
increase to remove each stash blocks. After the process, the given
package size for the watch device further reduces from 186M->155M.

In some rare cases, the removed stashed blocks don't directly contribute
to the maximum simultaneously stashed size. For example,
stash A: 10 blocks
stash B: 5 blocks
free B: 5 blocks  <-- stash B has been freed before we reach max stashed blocks
stash C: 10 blocks

Converting these blocks lead to an uncertain result. On one hand, patches
are generally smaller than the new data; while on the other hand, the
regenerated graph may have fewer order violation and thus give some size
reduction. But these cases are rare and it seems an overkill to consider all
possible scenarios here.

Bug: 120561199
Test: build non-A/B incrementals and check the size
(p.s. it can be tested on all target files with customed cache threshold)
Change-Id: I599420a91b80f1a1d83d22ee1b336b699050cfb4
2019-01-16 12:59:13 -08:00
Yifan Hong 4b0f34da5d Merge "Generate OTA for non-A/B devices with dynamic partitions"
am: 885787f4d3

Change-Id: I3df4f51fbb8111b0e6b0845921cd7949e5771c4c
2019-01-16 10:50:59 -08:00
Mark Salyzyn f92eb52866 Merge "build_image: right-sizing at least some spare inode"
am: f2f1854ca4

Change-Id: I14a099d227eb69dd595e58c641bb29181c2be9d5
2019-01-16 10:49:21 -08:00
Yifan Hong 885787f4d3 Merge "Generate OTA for non-A/B devices with dynamic partitions" 2019-01-16 18:42:58 +00:00
Mark Salyzyn f2f1854ca4 Merge "build_image: right-sizing at least some spare inode" 2019-01-16 18:36:58 +00:00
Mark Salyzyn c25b2bf458 build_image: right-sizing at least some spare inode
To address problems creating real tiny filesystem placeholders,
make sure extra spare inodes margin is greater than 0.
For initial estimate we add 4% of total we request at least 8.
For second pass estimate we add 0.2% of total we request at least 1.

We bumped up the margin for zie on the second pass to 0.3% as the
value was too close on one of the builds.

Test: build
Bug: 122328872
Change-Id: I41707bb6fcc8bbfbdda143a9ce62446cad9c1533
2019-01-16 09:54:31 -08:00
Anton Hansson dae8049421 Merge "Set TARGET_COPY_OUT_ for product/vendor in mainline"
am: 9a0dd5b288

Change-Id: I1dc2536767eb7c2a294a2359f1b6c47444f0dfe0
2019-01-16 08:57:14 -08:00
Anton Hansson 9a0dd5b288 Merge "Set TARGET_COPY_OUT_ for product/vendor in mainline" 2019-01-16 16:53:01 +00:00
Anton Hansson e360c96bc2 Merge "Add webview to mainline whitelist"
am: 3fc20bd7d9

Change-Id: I04597582695ae085a879a203aea8f1df49ecef27
2019-01-16 08:40:05 -08:00
Anton Hansson 3fc20bd7d9 Merge "Add webview to mainline whitelist" 2019-01-16 16:31:50 +00:00
SzuWei Lin 61ef97cb79 Merge "Split *_product makefiles"
am: 0735b4f9fe

Change-Id: I4258af36e153acc7ef752059adab4810f3fd224e
2019-01-16 07:33:09 -08:00
Treehugger Robot 0735b4f9fe Merge "Split *_product makefiles" 2019-01-16 15:18:37 +00:00
SzuWei Lin caa5e88d4a Split *_product makefiles
So far, we have *_system.mk and *_vendor.mk.
This patch split all product settings from *_vendor.mk to new
*_product.mk

This patch also create a new telephony.mk to include all
telephony_*.mk

Bug: 119747870
Test: lunch mainline_arm64-user; make -j
Test: compare the content with and without the patch
Test: the output files in out folder are the same
Change-Id: I79aefdd1971b3b5724a3ec858de4109b645c765a
Merged-In: I79aefdd1971b3b5724a3ec858de4109b645c765a
2019-01-16 22:23:35 +08:00
Anton Hansson 9791518d58 Set TARGET_COPY_OUT_ for product/vendor in mainline
This product variable is used to generate the loader config (to use
either /system/product or /product), and the vendor one is likely
used in similar ways. Having these partitions is required for mainline
devices, so set it in the shared BoardConfig.

Bug: 80410283
Test: make
Change-Id: I6f2d94ff43572a28df54ea8c60f2d838a3b9216c
2019-01-16 13:32:51 +00:00
Anton Hansson 0a5d5fec2e Add webview to mainline whitelist
The app will move to product soon, but temporarily
whitelist that mainline_arm64 adds it to /system.

Test: make
Change-Id: I7b0ce5623a160bcb0f8b89f3053a007019ff0b62
2019-01-16 13:31:02 +00:00
Anton Hansson 50ac1cb858 Merge "Remove webview from media_system.mk"
am: e7f127491a

Change-Id: I60b176aacf906ec30c26d2e4410b45b0e628a445
2019-01-16 01:51:39 -08:00
Anton Hansson e7f127491a Merge "Remove webview from media_system.mk" 2019-01-16 09:44:39 +00:00
Jeongik Cha 7808358cf1 Merge "Execute appcompat for apps built from soong"
am: d6dbd967b5

Change-Id: I6b261f50081e80eb357aecba683a2ffae82bc554
2019-01-16 01:01:05 -08:00
Treehugger Robot d6dbd967b5 Merge "Execute appcompat for apps built from soong" 2019-01-16 08:53:48 +00:00
Jeongik Cha f712ce79f5 Execute appcompat for apps built from soong
Appcompat runs for app defined in Android.mk, but not in Android.bp
So make appcompat run for app from soong(Android.bp)

Bug: 110073830
Bug: 122026042

Test: m out/target/product/$(get_build_var TARGET_DEVICE)/appcompat.zip

Change-Id: I73832410ec5850222b04086c2a377146886ba035
2019-01-16 14:27:21 +09:00
Colin Cross 33dab51b25 Merge "Revert "Simplify soong_java_prebuilt.mk and soong_app_prebuilt.mk""
am: 371f557f8e

Change-Id: I0ba059579bd7c5e7b5b8f78d4592b02a92d2dfa4
2019-01-15 17:54:06 -08:00
Colin Cross 371f557f8e Merge "Revert "Simplify soong_java_prebuilt.mk and soong_app_prebuilt.mk"" 2019-01-16 01:41:01 +00:00
Colin Cross 5d196364e1 Revert "Simplify soong_java_prebuilt.mk and soong_app_prebuilt.mk"
This reverts commit a76cc6d732.

Reason for revert: broke emma turbine build

Change-Id: Ie894565501d0de44f96dc736408a8c4e2ba2ed90
2019-01-16 01:38:41 +00:00
Colin Cross 725de55d03 Merge "Simplify soong_java_prebuilt.mk and soong_app_prebuilt.mk"
am: 8bc94444eb

Change-Id: I2fd9c7270314a90c160c27a97c0588b690303880
2019-01-15 16:08:54 -08:00
Yifan Hong 10c530d20a Generate OTA for non-A/B devices with dynamic partitions
Test: sideload full OTA on cuttlefish
Test: sideload incremental OTA on cuttlefish (that grows
      system, shrinks vendor, and move vendor to group foo)

Bug: 111801737

Change-Id: Ie8a267a90b4df9e9e0a2fbcc1b582ab2e353df52
2019-01-15 16:04:12 -08:00
Ivan Lozano b8b096a569 Merge "Enable execute-only memory layouts by default."
am: 77cd60adcb

Change-Id: I0f5c45cce702550545bfd150fe156cc725d1feca
2019-01-15 15:44:56 -08:00
Howard Chen 4c28a7da14 Merge "Add gsid"
am: a72cc8f038

Change-Id: I28ed7c9f06bd65b04bd24e77fe9a6356b5394a65
2019-01-15 15:42:30 -08:00
Colin Cross 8bc94444eb Merge "Simplify soong_java_prebuilt.mk and soong_app_prebuilt.mk" 2019-01-15 23:39:25 +00:00
Ivan Lozano 77cd60adcb Merge "Enable execute-only memory layouts by default." 2019-01-15 23:29:51 +00:00
Treehugger Robot a72cc8f038 Merge "Add gsid" 2019-01-15 23:26:58 +00:00
Ivan Lozano c244c21573 Enable execute-only memory layouts by default.
This enables execute-only memory (XOM) layouts to be used by default in
the build system. As of now, there's only support for ARM64 devices, so
this only affects those. Since userland XOM requires kernel support,
devices without the necessary support will continue to allow pages
marked execute-only to be read and they should be unaffected by this.

Bug: 77958880
Test: Device with and without kernel support boot.
Test: Binary throws segfault when reading from XOM on supported device.
Test: Debugger works and stack traces are still generated correctly.
Test: Teamfooding, stable during regular usage.

Change-Id: I8db4235c8e60eea6d701bdf3c43b79a06d6b01cd
2019-01-15 13:05:59 -08:00
Mark Salyzyn 1a34e1ed7e Merge changes I6457933a,I955aa0fa
am: db3c8985be

Change-Id: Ie37fd0f028dd95095b9a1fa4ebd2c8496a27b8b7
2019-01-15 12:40:52 -08:00