Commit graph

55583 commits

Author SHA1 Message Date
Yo Chiang
2214b0fb08 Merge "Add x86 / x86_arm mainline_system product"
am: 16652990ec

Change-Id: Ibb05a35c9da7176d08ddee433d0f26cfd1952f8b
2019-10-07 03:34:44 -07:00
SzuWei Lin
b1ed0bd95b Merge "Remove healthd from base_product.mk"
am: 7c7f144484

Change-Id: Ic1afd4de3df00df5d6779a1dbeb90fef40f8cf19
2019-10-07 03:29:20 -07:00
Treehugger Robot
16652990ec Merge "Add x86 / x86_arm mainline_system product" 2019-10-07 10:27:14 +00:00
Treehugger Robot
7c7f144484 Merge "Remove healthd from base_product.mk" 2019-10-07 10:10:34 +00:00
Tao Bao
bb20e1554b Merge "releasetools: Support verifying files with non-monotonic ranges."
am: 99d855db8f

Change-Id: I5f88c53f45a476eef1da8645735d188210f36c64
2019-10-06 21:11:59 -07:00
Tao Bao
99d855db8f Merge "releasetools: Support verifying files with non-monotonic ranges." 2019-10-07 01:33:30 +00:00
SzuWei Lin
24e6bcd0b6 Remove healthd from base_product.mk
healthd had been deprecated from Android P.
Does not need to support it now.

Bug: 142164625
Bug: 138284857
Test: lunch gsi_arm64-userdebug;make -j
Test: No healthd in out folder
Change-Id: I48db70f4bf39f6322bd2e80e536e2ec96b3a6408
2019-10-05 14:05:48 +08:00
Yo Chiang
db7529d009 Merge "Re-submit "Make mainline device use apex""
am: 491966fb7f

Change-Id: I32e950b118863ddfcfcb621cff664eb860345dc1
2019-10-04 20:44:15 -07:00
Yo Chiang
8b674819ac Add x86 / x86_arm mainline_system product
- Add mainline_x86 / mainline_x86_arm board
- Add mainline_system_x86 / mainline_system_x86_arm product
- BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4

These products build only system.img and vbmeta.img.
These serve as a "golden example" for x86 / arm64 CSI.

Bug: 141972143
Bug: 141657175
Test: lunch mainline_system_x86-userdebug; m
Test: Compare $ANDROID_PRODUCT_OUT against sdk_phone_x86 / aosp_cf_x86_phone
Change-Id: I40dec69ceadfe7057c1706b883b81958d3c0a416
2019-10-05 11:35:33 +08:00
Yo Chiang
491966fb7f Merge "Re-submit "Make mainline device use apex"" 2019-10-05 03:32:45 +00:00
Bill Peckham
2c4d3a7b6c Merge "Moving recovery resources from /system to /vendor"
am: 959b5ebbf8

Change-Id: Ied05e3765ea8afbc29b4d9bf713217d0d3753fa5
2019-10-04 20:24:19 -07:00
Bill Peckham
959b5ebbf8 Merge "Moving recovery resources from /system to /vendor" 2019-10-05 03:14:12 +00:00
Anton Hansson
b8205595c0 Re-submit "Make mainline device use apex"
The build system default was changed to not support apex, but
we want the mainline device to enable it.

Test: make mainline_system
Merged-In: I9f29e8354acffb1856dfd8a173b80a3f9324630c
Change-Id: I9f29e8354acffb1856dfd8a173b80a3f9324630c
2019-10-04 20:25:14 +08:00
Anton Hansson
5a6cf80073 Merge "CleanSpec for new system_other layout"
am: f89f29d669

Change-Id: I3eca4ad6cd59b3f2c03d391eae94cea3c45b07f6
2019-10-03 23:52:35 -07:00
Anton Hansson
f89f29d669 Merge "CleanSpec for new system_other layout" 2019-10-04 06:30:55 +00:00
Tao Bao
22632cc82c releasetools: Support verifying files with non-monotonic ranges.
Fixes: 79951650
Test: Run validate_target_files on target_files.zip with files in
      non-monotonic ranges.
Test: python -m unittest test_validate_target_files
Test: python3 -m unittest test_validate_target_files
Change-Id: I82571d3358598775de4cdeb5e64035689fea6487
2019-10-03 23:21:22 -07:00
Yo Chiang
fc810895ec Merge "Enforce /system module RRO for mainline products"
am: c578262e37

Change-Id: I4db1c617728cdc653ba993ddc414b6acca88db1d
2019-10-03 23:20:01 -07:00
Treehugger Robot
c578262e37 Merge "Enforce /system module RRO for mainline products" 2019-10-04 05:58:44 +00:00
Colin Cross
ad3ac35f8e Merge "Use -nostdlib++ instead of -nodefaultlibs"
am: a63ce3af4c

Change-Id: Iba432c7761f8e24d0e0f693cd9131b4862930653
2019-10-03 20:36:49 -07:00
Colin Cross
a63ce3af4c Merge "Use -nostdlib++ instead of -nodefaultlibs" 2019-10-04 03:26:11 +00:00
Dan Willemsen
e8d3948ec5 Merge "Fix lunch choices w/zsh"
am: b836b175c5

Change-Id: I0db5d9d5f44ed39beb378d6bc819ec76059f6630
2019-10-03 18:11:39 -07:00
Treehugger Robot
b836b175c5 Merge "Fix lunch choices w/zsh" 2019-10-04 00:56:23 +00:00
Bill Peckham
e868aec14b Moving recovery resources from /system to /vendor
This change is part of a topic that moves the recovery resources from the
system partition to the vendor partition, if it exists, or the vendor directory
on the system partition otherwise. The recovery resources are moving from the
system image to the vendor partition so that a single system image may be used
with either an A/B or a non-A/B vendor image. The topic removes a delta in the
system image that prevented such reuse in the past.

The recovery resources that are moving are involved with updating the recovery
partition after an update. In a non-A/B configuration, the system boots from
the recovery partition, updates the other partitions (system, vendor, etc.)
Then, the next time the system boots normally, a script updates the recovery
partition (if necessary). This script, the executables it invokes, and the data
files that it uses were previously on the system partition. The resources that
are moving include the following.

* install-recovery.sh
* applypatch
* recovery-resource.dat (if present)
* recovery-from-boot.p (if present)

This change includes the platform build system and release tools changes to
move the recovery resources from system to vendor (or /system/vendor). The
release tools need to know where to generate the recovery patch, and they
discover this from misc_info.txt variable board_uses_vendorimage, which the
platform build system generates.

We remove applypatch from PRODUCT_PACKAGES, but it is added back as a required
module in target/product/base_vendor.mk.

Several release tools rely on the misc_info.txt board_uses_vendorimage variable
to know how to generate and detect the recovery patch.

This change partially removes the --rebuild_recovery flag from the
merge_target_files.py script. The flag will be fully removed in a follow-on
change.

Bug: 68319577
Test: Ensure that recovery partition is updated correctly.
Change-Id: Ia4045bd67ffb3d899efa8d20dab4c4299b87ee5f
2019-10-04 00:04:34 +00:00
Colin Cross
84783a776e Use -nostdlib++ instead of -nodefaultlibs
Host builds using libc++ used -nodefaultlibs to turn off the default
C++ runtime, and then added back all the other necessary libraries.
Clang supports -nostdlib++ since https://reviews.llvm.org/D47115
that removes the C++ runtime without affecting the other default
libraries.  Use -nostdlib++, and remove the lists of default
libraries.

Test: m checkbuild
Change-Id: Ib8b761534f64fd7f881e14598e514783678e0b35
2019-10-03 16:04:52 -07:00
Dan Willemsen
91763e93e6 Fix lunch choices w/zsh
zsh doesn't split variables (by default), but it will split command
output. bash will split both. Apparently a portable way to do this in
both is to just turn it into another command: "$(echo $var)".

Test: source build/envsetup.sh; lunch (see list; repeat in bash and zsh)
Change-Id: I9716a8d77aefdf05da8923deb9e37e0b6132b549
2019-10-03 15:15:37 -07:00
Elliott Hughes
86ca29ee67 Merge "Remove ro.bionic.ld.warning."
am: bda45088a2

Change-Id: I9530d366890cea5e805be76bd30eff2a38b4d87c
2019-10-03 13:44:20 -07:00
Elliott Hughes
bda45088a2 Merge "Remove ro.bionic.ld.warning." 2019-10-03 20:10:50 +00:00
Logan Chien
ef2a9d7002 Merge "Always check ELF files for check-elf-files"
am: 455d7e545a

Change-Id: I866e40d5c0aec41d4135229a73c9da535e56f0eb
2019-10-03 09:15:35 -07:00
Logan Chien
455d7e545a Merge "Always check ELF files for check-elf-files" 2019-10-03 15:51:09 +00:00
Anton Hansson
8db2605038 CleanSpec for new system_other layout
Bug: 141707536
Test: m
Change-Id: I120362a230eb08863311a9c0d8aeb2f0ab6c81c7
2019-10-03 14:19:58 +01:00
Steven Moreland
05cbd78993 Merge "Remove libhidltransport/libhwbinder from VNDK."
am: 147f46ba72

Change-Id: I49c531f53e1a18a6dc1e36c3b3abdd6a8e4ebe86
2019-10-02 14:25:00 -07:00
Steven Moreland
147f46ba72 Merge "Remove libhidltransport/libhwbinder from VNDK." 2019-10-02 21:10:50 +00:00
Dongwon Kang
ed15824ac4 Merge "Remove codec libs from base_system.mk"
am: 03d3a36664

Change-Id: Icd39b6851fe01d9bb84f22b2bca1d2cc7976b754
2019-10-02 13:24:48 -07:00
Elliott Hughes
787ac2ed38 Remove ro.bionic.ld.warning.
Bug: http://b/141754375
Test: treehugger
Change-Id: I07c0d5424dde16e85bcd6d5639bc594ee8582b20
2019-10-02 11:40:59 -07:00
Treehugger Robot
03d3a36664 Merge "Remove codec libs from base_system.mk" 2019-10-02 18:21:41 +00:00
Yo Chiang
33b088d67f Enforce /system module RRO for mainline products
Turn on RRO enforcement for /system modules for products
that use mainline_system.mk

Bug: b/137727426
Test: compare_images
Change-Id: Ia1824481c85fb031d5e156307bf7a848e4721d9e
2019-10-02 18:44:11 +08:00
Yo Chiang
1876c3698d Merge "Change RRO enforcement logic"
am: 9c683dc968

Change-Id: I8a4ad0ece4e9ee0fc0112877fa0eb4d3f2b968ed
2019-10-01 19:47:50 -07:00
Yo Chiang
9c683dc968 Merge "Change RRO enforcement logic" 2019-10-02 02:34:35 +00:00
Yifan Hong
57a9fa8d77 Merge "Add virtual_ab to dynamic_partitions_info.txt"
am: 4ba2bdb13e

Change-Id: I648f81071e7e6437bf4098e133e8d787843f0970
2019-10-01 17:46:17 -07:00
Yifan Hong
4ba2bdb13e Merge "Add virtual_ab to dynamic_partitions_info.txt" 2019-10-02 00:36:24 +00:00
Pete Bentley
0867677242 Merge "Install BoringSSL self test binaries to vendor image."
am: 4c71349fe6

Change-Id: I0df28b485b88e7ca280dd5c14f51a988726ccc2d
2019-10-01 15:56:42 -07:00
Treehugger Robot
4c71349fe6 Merge "Install BoringSSL self test binaries to vendor image." 2019-10-01 22:38:19 +00:00
Dongwon Kang
6e2b1f84fd Remove codec libs from base_system.mk
- libstagefright_enc_common
- libstagefright_amrnb_common

Bug: 141885505
Test: build and boot.
      Checked libstagefright_enc_common.so doesn't exist in /system/lib64.
      libstagefright_amrnb_common.so is still there because other system
      module, librtp_jni.so, is using it, but there is no reason to keep
      this in base_system.mk.

Change-Id: I43692b50bd23e0b857606b42cb000c8566489dd6
2019-10-01 15:16:11 -07:00
Jesse Pai
da558de483 Merge "Generation of C Flags Artifacts"
am: 7a4bf49fb9

Change-Id: Ic0d5d0879cfa7705b87709fce6ba34b3094f719e
2019-10-01 13:14:22 -07:00
Treehugger Robot
7a4bf49fb9 Merge "Generation of C Flags Artifacts" 2019-10-01 19:25:50 +00:00
Yo Chiang
ee69213ce1 Merge "Enable mainline checking for mainline_system_arm64"
am: efd0d2da0f

Change-Id: I411a4ee5c3d21e66d4bba3197234a2330a226422
2019-10-01 02:45:31 -07:00
Treehugger Robot
efd0d2da0f Merge "Enable mainline checking for mainline_system_arm64" 2019-10-01 09:25:13 +00:00
Yo Chiang
4693fd1d05 Change RRO enforcement logic
Change RRO logic from
"Enforce RRO for all modules when PRODUCT_ENFORCE_RRO_TARGETS is '*'"
to
"Enforce RRO for all modules when PRODUCT_ENFORCE_RRO_TARGETS includes '*'"

Bug: b/137727426
Test: test build on local machine
Change-Id: I10b215c28919988ec58deb1fe3d5498ad4e73eb4
2019-10-01 15:08:36 +08:00
Yo Chiang
b58789b5b1 Enable mainline checking for mainline_system_arm64
Ensure only /system partition modules defined in mainline_system.mk is
included.

Test: lunch mainline_system_arm64-userdebug; m
Change-Id: I0cf9e28dd95fdc0f8f1eb88aefa07e230223b996
2019-10-01 14:36:11 +08:00
Bowgo Tsai
cf318328a4 Merge "recovery: install system_ext file_contexts and property_contexts"
am: 4ad561c6f8

Change-Id: I9ba28256529fed3d990e3e8ce1424024709b70a6
2019-09-30 19:45:55 -07:00