Commit graph

47810 commits

Author SHA1 Message Date
Mark Salyzyn
10d6aab12c Merge "fs_config: remove empty fs_config_* automation."
am: c8b3d5f92f

Change-Id: If9a7d9cf176aab35e13311c941e5da8072cbbf8b
2018-12-12 13:46:57 -08:00
Treehugger Robot
c8b3d5f92f Merge "fs_config: remove empty fs_config_* automation." 2018-12-12 21:27:15 +00:00
Mark Salyzyn
640816eb42 fs_config: remove empty fs_config_* automation.
The code to manage citing empty <partition>/etc/fs_config_{files|dirs}
content by specifically setting the file(s) to access mode 00000 is
bitrotted and ill-suited for multiple partitions and was written for
a more paranoid time when DAC and MAC rules were not nearly as mature.

Striking out the complications as it affected deterministic results.

Test: compile and boot
Bug: 119310326
Change-Id: Iec02e0c1194eaa799ab95adff4ff0951a24652a4
2018-12-12 08:40:19 -08:00
Nicolas Geoffray
41136edafd Merge "Remove perfprofd from set of binaries installed on system."
am: 1e57a89bf9

Change-Id: I0539202c7608fff7f206420adc1e560454ae9de8
2018-12-12 05:29:38 -08:00
Nicolas Geoffray
1e57a89bf9 Merge "Remove perfprofd from set of binaries installed on system." 2018-12-12 13:09:55 +00:00
Chen, ZhiminX
7961f460d7 Merge "Add recovery_acpio option to make recovery image"
am: 53de7a71f6

Change-Id: Ie38327b84791652f8e0693c74854675f488ec645
2018-12-12 00:30:36 -08:00
Treehugger Robot
53de7a71f6 Merge "Add recovery_acpio option to make recovery image" 2018-12-12 08:13:46 +00:00
Nicolas Geoffray
1bc5aff793 Remove perfprofd from set of binaries installed on system.
Needed to get some space on marlin-eng :(

Also avoids static linking libart into perfprofd. Roland will follow-up by reverting the no-perfprofd changes.

bug: 73175642

Test: lunch marlin-eng && m -j32
Change-Id: Ic1c79c6dd1052981801b92604f9891a8a63b4ea0
2018-12-11 23:00:57 +00:00
dimitry
ca97eaef00 Merge "Rename _complete-android-module-names"
am: 5e5cf8e17d

Change-Id: Iea29c9492fb25543887eadf75f01ca07ea736d62
2018-12-11 14:30:46 -08:00
TreeHugger Robot
f904d0f74e Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master" into stage-aosp-master 2018-12-11 21:49:25 +00:00
Treehugger Robot
5e5cf8e17d Merge "Rename _complete-android-module-names" 2018-12-11 19:46:20 +00:00
Tianjie Xu
b47bd0ff41 Merge "recovery text image: use zopflipng to compress the generated images"
am: b38ae44d1e

Change-Id: Icf3b031e418a0569df0309c01a6f58a79d9b7507
2018-12-11 11:08:44 -08:00
Tianjie Xu
b38ae44d1e Merge "recovery text image: use zopflipng to compress the generated images" 2018-12-11 18:56:20 +00:00
dimitry
73b8481edf Rename _complete-android-module-names
A function name with dashes is apparently not universally recognized
by shell versions/variants(?). Using underscore in place of dashes
solves this problem.

Test: ./development/vndk/tools/header-checker/utils/create_reference_dumps.py -l libGLESv1_CM
Change-Id: Id7d701600760140dae9e4762a11f4abd64947d10
2018-12-11 18:06:00 +01:00
Jeff Sharkey
3beb0bead2 Merge "Bump PREVIEW_SDK_INT for Q builds."
am: 0262df76b6

Change-Id: I5e35ffe15a8f875315b047da6d1b97b1a7f97e8f
2018-12-11 08:32:39 -08:00
Jeff Sharkey
0262df76b6 Merge "Bump PREVIEW_SDK_INT for Q builds." 2018-12-11 16:11:28 +00:00
Chen, ZhiminX
752439b321 Add recovery_acpio option to make recovery image
Test: can generate recovery image with recovery_acpio
Fixes: 111871613

Change-Id: I9174a4741f571a00bcadc548cd9e1316b4175132
2018-12-11 15:23:28 +08:00
xunchang
cc57d31c91 recovery text image: use zopflipng to compress the generated images
Generate the images for recovery's wipe data menu. And use the lossless
tool zopflipng to compress the generated image. This saves space
in the boot image at the cost of the increase of build time. In practice,
it adds about ~20 seconds to build the bootimage with 32 threads.

zopflipng generally runs slower. Even with a predefined filters
strategy, it runs about 3 times slower than pngcrush, e.g. ~40s vs 15s
to compress a 1.8M png file. However, zopflipng also gives a better
compression: ~1.4M vs 1.6M for the same image. So I guess the time
consumption is a price worth paying.

Bug: 74397117
Test: build the bootimage and check the resource images
Change-Id: I3e71f8bedd3c183a3374b1a9464bf05500e1aa61
2018-12-10 19:53:38 -08:00
Xin Li
ffef19fc52 DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master
Bug: 120502534
Change-Id: I9bd907538fd5a67818f9d067b6978946b9c4aded
2018-12-11 00:27:19 +00:00
Jeff Sharkey
f7d482bd9a Bump PREVIEW_SDK_INT for Q builds.
We've already added new APIs in Q, so we shouldn't be claiming a
value of "0", which signals a production platform release.

Bug: 120797950
Test: manual
Change-Id: I6c9063ac4ace79b3ee6b1c67ccdf76f4063ad165
2018-12-10 17:13:24 -07:00
Tianjie Xu
f2931497a2 Merge "Generate the recovery text images at build time"
am: 19e6502884

Change-Id: I7f7169dcf18ed064b86e6c64fc33340389c8a337
2018-12-10 11:56:12 -08:00
Tianjie Xu
19e6502884 Merge "Generate the recovery text images at build time" 2018-12-10 19:41:43 +00:00
Nicolas Geoffray
49eae2fac8 Merge "Factor out common code."
am: e3f39cd81e

Change-Id: Ia201f0d99369d8a2c878f32d35c3bcbce0167e70
2018-12-10 05:08:29 -08:00
Nicolas Geoffray
e3f39cd81e Merge "Factor out common code." 2018-12-10 12:50:54 +00:00
Chih-hung Hsieh
73a7a0ebaf Merge "Allow the include directive."
am: 0252d6e5cf

Change-Id: I25d955cad649ee1a10ceee0d15d55312ce3f9d4c
2018-12-07 15:42:30 -08:00
Chih-hung Hsieh
0252d6e5cf Merge "Allow the include directive." 2018-12-07 23:31:14 +00:00
Chih-Hung Hsieh
651294908f Allow the include directive.
* The include directive is ignored for now here.

Bug: 112259977
Test: ./checkowners.py  -v -c OWNERS
Change-Id: I671f3643ea88e50aea0957db59c36f10bff3b92d
2018-12-07 14:29:38 -08:00
Yifan Hong
40b9882e71 Merge "Don't build super image if source images are missing"
am: f37236df5f

Change-Id: I76bee32e535d67a25b000b83e63d135c5ec8e732
2018-12-07 13:47:58 -08:00
Treehugger Robot
f37236df5f Merge "Don't build super image if source images are missing" 2018-12-07 21:30:57 +00:00
Steven Moreland
6966bbb6a2 Merge "Add functions to jump to specific modules."
am: 4ea66801b2

Change-Id: I994dcab9f6e6e46290a53a133ce6f7a7f1b10067
2018-12-07 13:02:43 -08:00
Treehugger Robot
4ea66801b2 Merge "Add functions to jump to specific modules." 2018-12-07 20:47:40 +00:00
Yifan Hong
e98427ac3f Don't build super image if source images are missing
For some internal branches, vendor.img isn't built, so there
is no need to build super image / super split images there.

Test: remove vendor.img and VENDOR/ from target_files_intermediates, then
      run add_img_to_target_files
Fixes: 120634805

Change-Id: I2834a27ce232538f203733c204dd257279c789fc
2018-12-07 11:01:21 -08:00
Mark Salyzyn
9be41822ed Merge "fs_config: add product and product_services"
am: e717da446b

Change-Id: I1542044483b62de26eee52548e8249701a89710f
2018-12-07 09:02:36 -08:00
Treehugger Robot
e717da446b Merge "fs_config: add product and product_services" 2018-12-07 16:52:04 +00:00
Nicolas Geoffray
ed167cf814 Factor out common code.
Test: m
Change-Id: If718c281656a890fb5eba54eb290976c153e2bb6
2018-12-07 14:35:52 +00:00
Nicolas Geoffray
3b5e4ca742 Merge "Use the final APK for dexpreopt when it's not stripped."
am: 923f267bf6

Change-Id: I42a4e62034c14fcdecb35f5baff4cb13b1146e19
2018-12-07 06:21:04 -08:00
Nicolas Geoffray
923f267bf6 Merge "Use the final APK for dexpreopt when it's not stripped." 2018-12-07 14:13:45 +00:00
android-build-team Robot
4a676aaa3a Version bump to PPRL.181205.001
Change-Id: I9174bab704afa3ff85be5236be16d15f66446bb4
2018-12-07 02:58:19 +00:00
Steven Moreland
62054a43fa Add functions to jump to specific modules.
Usage:
...aosp/$ gomod libbase
...aosp/system/core/base$

Using in alias:
alias g=gomod
complete -F _complete-android-module-names g

...aosp/$ g libbase
...aosp/system/core/base$

Nothing in Android keeps an up to date index of all Android modules
and their locations between builds. However, there is a target
'module-info.json' which is used to contain some of that information.
This module can be updated using the command 'refreshmod' added
here, but it will also be updated during a normal Android build.

This also adds auto-complete for m.

Bug: N/A
Test: manual
Change-Id: I06b0b87c308b9fe2798dbc29225906cc30fe59fe
2018-12-06 18:28:50 -08:00
Nicolas Geoffray
d80f9c0d32 Use the final APK for dexpreopt when it's not stripped.
The final APK may contain compressed or uncompressed dex files,
and this affects dex2oat compilation.

Test: build sailfish, test that SystemUI.vdex and Settings.vdex
don't have the dex code.

Change-Id: Ic032f61ed67dcdf342f6eaef71d805b89d6fc99a
2018-12-07 00:19:57 +00:00
Tao Bao
a9ead89c9d Merge "releasetools: Keep the original RangeSet for 'uses_shared_blocks' case."
am: 70edcab678

Change-Id: I58d4bc2fb3b18dd8bc41b7f46a1e4c63672f0385
2018-12-06 15:41:26 -08:00
Mark Salyzyn
cf343a6d1e fs_config: add product and product_services
Mechanical extension of mount directories to also support product/
and product_services/ as individually supplied images.

NB: In the distant past, a prototype placing the make rules into a
    macro was rejected as too difficult to maintain within the macro
    rules, so rules are rolled-out to make them easy to understand.

Test: compile
Bug: 119310326
Change-Id: Ief137cbe62db7175ee02275804ff1d644858dc3d
2018-12-06 22:13:26 +00:00
Tao Bao
70edcab678 Merge "releasetools: Keep the original RangeSet for 'uses_shared_blocks' case." 2018-12-06 21:31:28 +00:00
Andreas Gampe
31e6044aba Merge "Build: Add test apex keys to debug product packages"
am: ab459af5b5

Change-Id: I074cb30010b9e2cd1d0a83b6aaa135026e9a452c
2018-12-06 11:28:10 -08:00
Andreas Gampe
ab459af5b5 Merge "Build: Add test apex keys to debug product packages" 2018-12-06 19:13:56 +00:00
Tao Bao
2a20f344fc releasetools: Keep the original RangeSet for 'uses_shared_blocks' case.
Setting 'uses_shared_blocks' indicates that the block list for a given
file is incomplete, as some of the blocks are "owned" by others. As a
result, such a file will be skipped from imgdiff'ing.

This CL makes a copy of the original block list before removing the
shared blocks. It uses the original RangeSet as the value of
extra['uses_shared_blocks']. validate_target_files.py will try to read
the file as in the original RangeSet, unless the original list is also
incomplete or has non-monotonic ranges.

Test: Run validate_target_files on a target that uses
      `BOARD_EXT4_SHARE_DUP_BLOCKS := true`.
Change-Id: I259e871ecc249ba0c14b5796bef413185a1b8242
2018-12-06 10:28:49 -08:00
Tianjie Xu
81c88ad58b Generate the recovery text images at build time
We used to manually generate the background text images for recovery. That
process requires opening various emulators and takes a long time. Now that
the host Java tool is ready to generate these images, we can embed the
generation step into the build of the recovery image.

Since there's currently no make variable that defines screen width of the
device, we put the commonly used values for pixels here, i.e. 1440 for
xxxhdpi and 1080 for xxhdpi. Devices with other dpi can still use this
feature if they define the screen width in their config files.

Test: build bootimage with screen with set/unset
Change-Id: Ic8389a527e6e7194de58a9c50763e841e886652b
2018-12-06 01:10:38 -08:00
Vic Yang
7699a2e468 Merge "Move android_ids from .data.rel.ro to .rodata"
am: 4379a28921

Change-Id: Ic9331c06c045c21180356107607ccc0f29617b23
2018-12-05 22:27:26 -08:00
Vic Yang
4379a28921 Merge "Move android_ids from .data.rel.ro to .rodata" 2018-12-06 06:04:23 +00:00
Evgenii Stepanov
fbf0759fa3 Merge "[make] Disable CFI when building with HWASan."
am: 696dd3bd93

Change-Id: I5627f51b0907e1ca5a37a3d3ccd68ef66bf683da
2018-12-05 14:30:02 -08:00