Commit graph

50603 commits

Author SHA1 Message Date
Suren Baghdasaryan
6f4fd6c5e3 Add libprocessgroup into VNDK
Include libprocessgroup into vndk because libprocessgroup now implements
sched_policy control functions.

Bug: 111307099
Test: builds, boots
Change-Id: If18227e8a824a1e606df78dfe01d9d2437c62792
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2019-01-18 02:36:49 +00:00
Mark Salyzyn
2377996a50 Merge "build_image: Increase spare inodes to 12." am: aa58210dd0 am: fb37e0b6a2
am: 68fed3ce30

Change-Id: I4973b32d8799202eaee16075cab69c48dde4feca
2019-01-17 18:33:29 -08:00
Mark Salyzyn
68fed3ce30 Merge "build_image: Increase spare inodes to 12." am: aa58210dd0
am: fb37e0b6a2

Change-Id: If15f0120fd63197b510095492c51b11c48b0bcd1
2019-01-17 18:24:20 -08:00
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
748e839bdf Merge changes from topics "hiddenapi-soong", "hostdex_install" am: d61a1aba36 am: 9cfe03b9d5
am: b1e0d646e6

Change-Id: Ib2b539012d410a54489e2845c2d7707c1fec42e7
2019-01-17 15:54:28 -08:00
Colin Cross
b1e0d646e6 Merge changes from topics "hiddenapi-soong", "hostdex_install" am: d61a1aba36
am: 9cfe03b9d5

Change-Id: Ie757f3e9c98d121967185b9d909c9b1ed82417fc
2019-01-17 15:30:06 -08: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
594e8e6df6 [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190105.001) into master" am: ab9de0ab6e -s ours am: e2b87fa9be -s ours
am: 06ff142d70 -s ours
am skip reason: subject contains skip directive

Change-Id: I4d1cdeaadc5632924187d098b68fcd1d6cee0e31
2019-01-17 14:29:39 -08:00
Xin Li
06ff142d70 [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190105.001) into master" am: ab9de0ab6e -s ours
am: e2b87fa9be -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3ee861d1bf2de35af26dbd91234c0c4d97c18fe6
2019-01-17 14:15:53 -08: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
3042c43e27 [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190105.001) into master am: dd1f2cf7de -s ours
am: 7c28813adf -s ours
am skip reason: subject contains skip directive

Change-Id: I5cb7fcac9a782b3ddd4ea127a48e5ef5268f3883
2019-01-17 14:02:55 -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
Nicolas Geoffray
9c3766f6ca Merge "dex_preopt: differentiate between updatable boot jars and non-updatable boot jars." am: 85437e248d am: f2c2fe0707
am: f30bffd1b7

Change-Id: I21beec07776e36ae81cf299e1825f93bb7ad581a
2019-01-17 10:31:29 -08:00
Nicolas Geoffray
f30bffd1b7 Merge "dex_preopt: differentiate between updatable boot jars and non-updatable boot jars." am: 85437e248d
am: f2c2fe0707

Change-Id: I23ab55d3405046846e6fd85ec8e435b417804a96
2019-01-17 10:27:14 -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
42244aac19 Merge "blockimgdiff: selectively convert 'diff' commands to 'new' to reduce stash size" am: ffc87ac0a7 am: 4046b8f741
am: e8be9168fe

Change-Id: Iaf05286b871685bbaa6194c810b528198692a97d
2019-01-17 09:31:06 -08:00
Tianjie Xu
e8be9168fe Merge "blockimgdiff: selectively convert 'diff' commands to 'new' to reduce stash size" am: ffc87ac0a7
am: 4046b8f741

Change-Id: If6ad6cc16e5758f48ed79c3291e77c2321bd5a86
2019-01-17 09:22:55 -08: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
2bdc11d333 [automerger skipped] Merge "Change the impl lib name of java_sdk_library" am: 0a8750b3da am: c2214aaaff -s ours
am: 529ce6eabc -s ours
am skip reason: change_id I275cd40e3682640b96425e56698cea770888cbb1 with SHA1 ab48e20448 is in history

Change-Id: I08bfe6bee19f5513cb5f12c384c87dbbedef4520
2019-01-17 02:40:06 -08:00
Sundong Ahn
529ce6eabc [automerger skipped] Merge "Change the impl lib name of java_sdk_library" am: 0a8750b3da
am: c2214aaaff -s ours
am skip reason: change_id I275cd40e3682640b96425e56698cea770888cbb1 with SHA1 ab48e20448 is in history

Change-Id: Idec49de46ba41f41db91ae2a07cdda3708936d77
2019-01-17 02:25:51 -08: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
97284a9a22 [automerger skipped] Merge "Change the impl lib name of java_sdk_library" into pi-dev-plus-aosp
am: 3a60ed49bb -s ours
am skip reason: change_id I275cd40e3682640b96425e56698cea770888cbb1 with SHA1 0372f189ac is in history

Change-Id: I64c2e984d90c9108667d5e318f29180283607bfd
2019-01-16 17:01:59 -08: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
TreeHugger Robot
3a60ed49bb Merge "Change the impl lib name of java_sdk_library" into pi-dev-plus-aosp 2019-01-17 00:40:52 +00: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
9780b8c1e4 Merge "Generate OTA for non-A/B devices with dynamic partitions" am: 885787f4d3 am: 4b0f34da5d
am: 7f7e2635cb

Change-Id: I5eb4228d4545f056772e1be5827a4df2ce49c2e4
2019-01-16 11:04:05 -08:00
Android Build Merger (Role)
8b6faaa14c Merge "Merge "build_image: right-sizing at least some spare inode" am: f2f1854ca4 am: f92eb52866 am: 34c0af7a11" 2019-01-16 19:01:50 +00:00
Anil Admal
214c084ba7 Merge "Non-framewok location access visibility and control (VNDK)" 2019-01-16 19:01:42 +00:00
Mark Salyzyn
33e3c26cfd Merge "build_image: right-sizing at least some spare inode" am: f2f1854ca4 am: f92eb52866
am: 34c0af7a11

Change-Id: Ia5322176bd51b8728dc1a724327616a243de8670
2019-01-16 11:01:37 -08:00
Yifan Hong
7f7e2635cb Merge "Generate OTA for non-A/B devices with dynamic partitions" am: 885787f4d3
am: 4b0f34da5d

Change-Id: I76ad575bf821f693b2879af5926ffd8abe73fc7e
2019-01-16 10:58:14 -08:00
Mark Salyzyn
34c0af7a11 Merge "build_image: right-sizing at least some spare inode" am: f2f1854ca4
am: f92eb52866

Change-Id: I80f5a8b6b53a043ff8e2b1ac0717dd19b43ea981
2019-01-16 10:56:25 -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
f4e9102ea8 Merge "Set TARGET_COPY_OUT_ for product/vendor in mainline" am: 9a0dd5b288 am: dae8049421
am: 8dad70660d

Change-Id: Ib9eae63af430c2751093cfc731145139b708e421
2019-01-16 09:09:38 -08:00
Anton Hansson
8dad70660d Merge "Set TARGET_COPY_OUT_ for product/vendor in mainline" am: 9a0dd5b288
am: dae8049421

Change-Id: I1d4f24d68ed3fbc626ecbe1ac7db448e1ae559a6
2019-01-16 09:03:27 -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