Commit graph

39037 commits

Author SHA1 Message Date
Ryan Campbell
aea0f92ff3 Create product sysprops on vendor partition.
Duplicate essential product sysprops for manufacturer, model, brand, name, and device
from system on vendor so that mixed builds (vendor.img + GSI system.img) have correct
product information in their CTS/VTS reports.

Test: make
Bug: 64458205
Change-Id: Ib63b37772be493b9e035d9b7e8c5e2cf66f2fa8c
2017-10-13 15:47:58 -07:00
Mathieu Chartier
a78549885e Merge "Add Android Go defaults make file" into oc-mr1-dev 2017-10-07 00:17:07 +00:00
Mathieu Chartier
0a0e5ea533 Add Android Go defaults make file
Go devices should inherit this file to provide good default settings
for providing the best experience on Android Go devices.

Bug: 67374015
Test: make and flash

Change-Id: I55f22735c70f69309ec77e5c3055e6747546c79a
2017-10-04 09:11:38 -07:00
Dan Willemsen
905b2e00f1 Ignore zip comments in dump-package-stats
Use -q to silence zip comments, which also silences the first line.

Bug: 67345114
Test: find vendor -name '*.apk' | xargs build/tools/dump-package-stats
Change-Id: Icb319c603de7c29644c58520213940179f67b7e4
2017-10-03 18:57:18 -07:00
TreeHugger Robot
90e737c6b6 Merge "GSI: add the messaging app" into oc-mr1-dev 2017-09-30 02:13:04 +00:00
Dan Willemsen
e49ee7095f Enforce TARGET_USES_MKE2FS := true for new devices
Bug: 62434479
Test: verify failure on 27 device w/o TARGET_USES_MKE2FS
Test: verify success on 27 device w/ TARGET_USES_MKE2FS
Test: `build/test/build_test.sh -only-config` on oc-mr1-dev and master
Change-Id: Ib7e8dad404a1eaf70f47ee1d46528be4aabd6e80
2017-09-29 22:56:30 +00:00
TreeHugger Robot
f7ade144dd Merge "Use computed salt for AVB-signed images." into oc-mr1-dev 2017-09-29 21:11:32 +00:00
Tao Bao
16cda2fbff Use computed salt for AVB-signed images.
We want the generated images being identical for the same source files.
Currently the generated ext4 image (either from make_ext4fs or mke2fs)
is reproducible, but the AVB footer added by avbtool contain changes
because of the random salt being used.

This CL changes the avbtool invocation to specify "--salt <hexstring>"
(already supported by avbtool) to use reproducible salt that's computed
based on fingerprints (or thumbprints if applicable).

Bug: 67023482
Test: Regenerate images from the same source as follows:
  Use a target_files.zip from an AVB-enabled target.
    $ zip -d target_files.zip IMAGES/\*
    $ ./build/make/tools/releasetools/add_img_to_target_files.py \
          -v target_files.zip
  Repeat the above commands and compare the generated images.
Change-Id: Id9db17ae0132ca3a820b4be5a5ef06ca3fef71ed
Merged-In: Id9db17ae0132ca3a820b4be5a5ef06ca3fef71ed
(cherry picked from commit 8f05cca1d9)
2017-09-29 10:44:57 -07:00
TreeHugger Robot
cb71f5706e Merge "Change aosp_arm_(a|ab) to 768MB" into oc-mr1-dev 2017-09-29 03:50:41 +00:00
Hung-ying Tyan
a4a944b717 GSI: add the messaging app
in order to pass
android.telecom.cts.ExtendedInCallServiceTest#testOnCannedTextResponsesLoaded
on GSI.

Bug: 66983288
Test: boot marlin-user with GSI (aosp_arm64_ab-userdebug) and pass the test.
Change-Id: I77a2d59e5525c0e93806312a9cf79be5093523bc
2017-09-28 12:10:16 +08:00
Tao Bao
87153c64fc Build repeatable system images with mke2fs.
We have added support in mkuserimg_mke2fs.sh that allows specifying
filesystem UUID and hash seed UUID. This CL generates and passes the
UUIDs based on the image name and build fingerprint. This way we can
rebuild and get identical images.

Note that this only applies to images generated with `m dist` and with
signing tools (sign_target_files_apks.py and
add_img_to_target_files.py). Images under $OUT (built with `make`) are
not affected.

Bug: 64994964
Test: lunch marlin-userdebug; run `m dist` twice (after deleting the
      intermediate files under $OUT/obj/PACKAGING), and compare the
      generated images.
Change-Id: I41cf4e5869582bb930af2f35a8e9c79bff43b2a2
(cherry picked from commit 3aa21e6bb9)
2017-09-27 14:49:36 -07:00
SzuWei Lin
98ef408b83 Change aosp_arm_(a|ab) to 768MB
Bug: 64733959
Bug: 66880884
Test: Build pass with these 2 projects
Change-Id: Ic8dc39d861b7fe80bd805e0d73e2b5438f98a31b
2017-09-26 16:46:49 +08:00
Mathieu Chartier
1fbc7fe671 Merge "Add support for profiles without preopt" into oc-mr1-dev 2017-09-22 19:48:40 +00:00
Jiyong Park
8f7bc0e6bd DO NOT MERGE: Fix incorrect TARGET_2ND_CPU_VARIANT for A/B devices
TARGET_2ND_CPU_VARIANT for non A/B devices has been changed to
cortex-a15 for better performance. Do the same for A/B devices.

Bug: 65042524
Test: build with aosp_arm64_ab
Change-Id: Id67c2779d2170f29b278c1c8a9ac513aa76a620d
2017-09-21 19:44:05 +09:00
TreeHugger Robot
febdef4e87 Merge "Disable VNDK runtime checking" into oc-mr1-dev 2017-09-20 08:39:26 +00:00
SzuWei Lin
04f6ff5adb Disable VNDK runtime checking
GSI enabled the VNDK, but devices need to fix the depedency of
libraries. Before that, disable the VNDK runtime checking temporary.

Bug: 65190702
Test: Test on a device which doesn't fix VNDK dependency with GSI
Change-Id: Ib942a7efdc75beca93c60d1e0484835342efcfd2
2017-09-20 14:28:18 +08:00
Calin Juravle
f7517503da Merge "Set the default value of pm.dexopt.shared to speed" into oc-mr1-dev 2017-09-19 21:56:36 +00:00
Mathieu Chartier
4876229afd Add support for profiles without preopt
Add and push profiles for apps that are not preopted. This will be
used to enable speed-profile during first boot if required.

Also add missing handling to have profiles properly named for
compressed APKs.

Test: make and flash
Bug: 38032017
Bug: 64503246

Change-Id: Ie1fbb5ed5a5d7e1e0be05f62aff1f4881a3bd1be
2017-09-19 08:50:50 -07:00
Mathieu Chartier
9e2fd26a29 Merge "Add product property for preopting extracted APKs" into oc-mr1-dev 2017-09-18 22:49:15 +00:00
Calin Juravle
3fdb549931 Set the default value of pm.dexopt.shared to speed
By default, we should compile all shared apks with the speed filter.

Bug: 65591595
Test: build & boot
Change-Id: I8781ca47090321a32641ec4c7a4ed3c722bab475
2017-09-18 13:05:24 -07:00
Mathieu Chartier
0fbb836cf6 Add product property for preopting extracted APKs
The property is PRODUCT_ALWAYS_PREOPT_EXTRACTED_APK. If specified,
this preopts the APK with the default compile filter (quicken).

This will be used to quicken preopt of gmscore dynamite modules when
preopting is disabled. This fixes a possible RAM regression caused
by running out of the APK.

Bug: 65601274
Test: make and flash

Change-Id: Ibf0fa73ee7fafd9735e587baf19c4950a7da817a
2017-09-18 12:43:49 -07:00
TreeHugger Robot
113fbe4468 Merge "Set default size for 32-bit GSI to 1 GB" into oc-mr1-dev 2017-09-18 04:31:26 +00:00
TreeHugger Robot
bc6d7783b8 Merge "DO NOT MERGE: Fix incorrect TARGET_2ND_CPU_VARIANT for non-A/B devices" into oc-mr1-dev 2017-09-16 08:01:33 +00:00
Tao Bao
86dc28223e Merge "Consider prebuilt vendor.img as having vendor partition." into oc-dr1-dev
am: 0bf9b22866  -s ours

Change-Id: I16f115c55ff1ee3784953e4089ffb3d948b6faf0
2017-09-15 13:46:24 +00:00
TreeHugger Robot
0bf9b22866 Merge "Consider prebuilt vendor.img as having vendor partition." into oc-dr1-dev 2017-09-15 13:42:18 +00:00
Björn Davidsson
062191956f DO NOT MERGE: Fix incorrect TARGET_2ND_CPU_VARIANT for non-A/B devices
The BoardConfig.mk for arm64 non-A/B devices sets
TARGET_2ND_CPU_VARIANT to generic. This causes the generic
C implementation of memmove to be included instead of the optimized
NEON assembler implementation. This implementation is significantly
slower, in some cases enough to cause CTS failures.

The BoardConfig.mk for arm64 A/B correctly sets
TARGET_2ND_CPU_VARIANT to cortex-a15, and the comments in
build/target/board/generic_arm64/BoardConfig.mk make it quite
clear that this is the correct setting.

Bug: 65042524
Test: build with aosp_arm64_a

Change-Id: I3aa7beddc1039b9fe3178740dfdb90858c93dff7
2017-09-15 14:51:39 +09:00
Tao Bao
6bec81a924 Merge "Consider prebuilt vendor.img as having vendor partition." into oc-mr1-dev 2017-09-14 17:04:46 +00:00
Isaac Chen
09d0d5b8c5 Set default size for 32-bit GSI to 1 GB
The previous size for 32-bit GSI (906 MB) is not enough for x86 GSI.
Increase it to 1 GB (1024 MB). If some other arch, say arm, wants to
use a smaller size, it can overwrite the default in its BoardConfig.mk.

Bug: 65437122
Test: lunch aosp_x86_a; make -j; lunch aosp_arm_a; make -j
Change-Id: I092966f0a0a327b1080ee10782960c6ccf44d8ee
2017-09-14 18:01:18 +08:00
TreeHugger Robot
5df8ae4bf6 Merge "add llndk|vndksp.libraries.txt to vndk_package" into oc-mr1-dev 2017-09-14 01:35:36 +00:00
Tao Bao
f23bbf19d4 Consider prebuilt vendor.img as having vendor partition.
vendor.img could be built from the source - in which case we have
unpacked files under VENDOR/ - or dropped in as a prebuilt binary blob.
We should consider either of them as target having a vendor partition.
Because we need to add its AVB hashtree info into vbmeta.img if target
is using AVB. Otherwise libfs_mgr would refuse to mount this
"AVB-enabled" vendor.img.

For targets not using AVB, this change is no-op.

Bug: 65462819
Test: Having vendor.img as prebuilt, `make dist`. Check that the
      generated vbmeta.img contains the info from vendor.img.
Test: Build, flash and boot the above image.zip.
Change-Id: Iaeb30e2059cb33fb39f23e5ffd28f338d00ccbfc
Merged-In: Iaeb30e2059cb33fb39f23e5ffd28f338d00ccbfc
(cherry picked from commit b22afea0f0)
2017-09-14 00:42:56 +00:00
Adam Seaton
d848e46392 [Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64 am: 0bae3f0fa4 am: b691e678be am: 33e8f674d7 -s ours am: a991b6acc2 am: 59bbe44770 am: a58425e0c8 am: 0b0e0bc4cd am: dd45809495 -s ours am: e9263f666f
am: eada8fa3e3

Change-Id: Ie9b4b95791f7d8ddadc1f0c7eaf51a08f0ef74d9
2017-09-13 23:07:24 +00:00
Adam Seaton
6456146a74 [Do Not Merge] Update Security String to 2017-11-01 on nyc-dev bug:65631379 am: 6f224a7615 am: cbe21a52c8 am: 8d7c08cafd am: 86e0337fda am: 6b626cb4c6 -s ours am: 26bba7b920
am: 54f1f70971

Change-Id: I9d2bfb50c2ea651bb20fe54887f8f854aa98d583
2017-09-13 23:06:36 +00:00
Adam Seaton
eada8fa3e3 [Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64 am: 0bae3f0fa4 am: b691e678be am: 33e8f674d7 -s ours am: a991b6acc2 am: 59bbe44770 am: a58425e0c8 am: 0b0e0bc4cd am: dd45809495 -s ours
am: e9263f666f

Change-Id: I5503b2599e415537b073aee6ea77b927b626fb52
2017-09-13 22:25:08 +00:00
Adam Seaton
54f1f70971 [Do Not Merge] Update Security String to 2017-11-01 on nyc-dev bug:65631379 am: 6f224a7615 am: cbe21a52c8 am: 8d7c08cafd am: 86e0337fda am: 6b626cb4c6 -s ours
am: 26bba7b920

Change-Id: Iaac09874916721ac42a237ad4e0752188ecdab8c
2017-09-13 22:24:25 +00:00
Adam Seaton
e9263f666f [Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64 am: 0bae3f0fa4 am: b691e678be am: 33e8f674d7 -s ours am: a991b6acc2 am: 59bbe44770 am: a58425e0c8 am: 0b0e0bc4cd
am: dd45809495  -s ours

Change-Id: Ia0de479da3bf6908207d6c33ae53133a7db6b7a0
2017-09-13 22:01:01 +00:00
Adam Seaton
26bba7b920 [Do Not Merge] Update Security String to 2017-11-01 on nyc-dev bug:65631379 am: 6f224a7615 am: cbe21a52c8 am: 8d7c08cafd am: 86e0337fda
am: 6b626cb4c6  -s ours

Change-Id: I5ec186bddfd6e2d5a2acae973392f2cf2d44b87b
2017-09-13 22:00:29 +00:00
Tao Bao
2a2dbcd4b5 Consider prebuilt vendor.img as having vendor partition.
vendor.img could be built from the source - in which case we have
unpacked files under VENDOR/ - or dropped in as a prebuilt binary blob.
We should consider either of them as target having a vendor partition.
Because we need to add its AVB hashtree info into vbmeta.img if target
is using AVB. Otherwise libfs_mgr would refuse to mount this
"AVB-enabled" vendor.img.

For targets not using AVB, this change is no-op.

Bug: 65462819
Test: Having vendor.img as prebuilt, `make dist`. Check that the
      generated vbmeta.img contains the info from vendor.img.
Test: Build, flash and boot the above image.zip.
Change-Id: Iaeb30e2059cb33fb39f23e5ffd28f338d00ccbfc
Merged-In: Iaeb30e2059cb33fb39f23e5ffd28f338d00ccbfc
(cherry picked from commit b22afea0f0)
2017-09-13 14:59:52 -07:00
Adam Seaton
1bc297f5a4 Update Security String to 2017-11-05 on oc-dev bug:65631379 am: d24487a2f2
am: 6b7c615cb6

Change-Id: Icf400abc60bc19454782c54502f19268e67dd240
2017-09-13 21:52:55 +00:00
Adam Seaton
3d2a4f8363 Update Security String to 2017-11-01 on oc-dev bug:65631379 am: 8f4a4c2131
am: 8e3eac06fb

Change-Id: I4fd03c02fc470cc1738effa2d1209503ca717ded
2017-09-13 21:52:44 +00:00
Adam Seaton
dd45809495 [Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64 am: 0bae3f0fa4 am: b691e678be am: 33e8f674d7 -s ours am: a991b6acc2 am: 59bbe44770 am: a58425e0c8
am: 0b0e0bc4cd

Change-Id: I2676860fa74fee08c8b7572c858b4ed7bf637d60
2017-09-13 21:40:05 +00:00
Adam Seaton
6b626cb4c6 [Do Not Merge] Update Security String to 2017-11-01 on nyc-dev bug:65631379 am: 6f224a7615 am: cbe21a52c8 am: 8d7c08cafd
am: 86e0337fda

Change-Id: I6cf99491e86212322b93f50f56a57d22c6c4de73
2017-09-13 21:39:22 +00:00
Adam Seaton
6b7c615cb6 Update Security String to 2017-11-05 on oc-dev bug:65631379
am: d24487a2f2

Change-Id: Ib474659c9e72e5ad803a0e28f9fb11b7057d4939
2017-09-13 21:30:22 +00:00
Adam Seaton
8e3eac06fb Update Security String to 2017-11-01 on oc-dev bug:65631379
am: 8f4a4c2131

Change-Id: Iee28cf19c5020c8dde26c1a25a92609ee7221c8d
2017-09-13 21:29:44 +00:00
Adam Seaton
0b0e0bc4cd [Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64 am: 0bae3f0fa4 am: b691e678be am: 33e8f674d7 -s ours am: a991b6acc2 am: 59bbe44770
am: a58425e0c8

Change-Id: I2ef9cd3f22416f41b17443eb7d6656a96033e75d
2017-09-13 21:18:21 +00:00
Adam Seaton
86e0337fda [Do Not Merge] Update Security String to 2017-11-01 on nyc-dev bug:65631379 am: 6f224a7615 am: cbe21a52c8
am: 8d7c08cafd

Change-Id: I4a20828070dda22489d23d4230a542824ab6af56
2017-09-13 21:16:26 +00:00
Adam Seaton
a58425e0c8 [Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64 am: 0bae3f0fa4 am: b691e678be am: 33e8f674d7 -s ours am: a991b6acc2
am: 59bbe44770

Change-Id: I92206f5171cd80db0029237a74924af7e4f76574
2017-09-13 20:50:38 +00:00
Adam Seaton
8d7c08cafd [Do Not Merge] Update Security String to 2017-11-01 on nyc-dev bug:65631379 am: 6f224a7615
am: cbe21a52c8

Change-Id: I3f4f017f9b6b4686d49e180bb219dae2fecbe424
2017-09-13 20:48:56 +00:00
Adam Seaton
59bbe44770 [Do Not Merge] Update Security String to 2017-11-01 on mnc-dev bug:65631379 am: 0c93452c64 am: 0bae3f0fa4 am: b691e678be am: 33e8f674d7 -s ours
am: a991b6acc2

Change-Id: I4d8f6bf1aae97821ef9fe6f107d482b06b950536
2017-09-13 20:13:41 +00:00
Adam Seaton
cbe21a52c8 [Do Not Merge] Update Security String to 2017-11-01 on nyc-dev bug:65631379
am: 6f224a7615

Change-Id: Ie971527d3806889e9df5b6cb32ef362957ea389f
2017-09-13 20:12:59 +00:00
Tao Bao
6dbd8a0b8c Merge "Skip checking files that have less blocks in block map." into oc-dr1-dev
am: 2998812706  -s ours

Change-Id: I32391594e12726a7e855d7e847da483f07c6dcd3
2017-09-13 20:09:46 +00:00