Commit Graph

38972 Commits

Author SHA1 Message Date
TreeHugger Robot aa7f44d4d4 Merge "Support excluding overlays when enforcing RRO" into oc-mr1-dev 2017-09-08 21:53:43 +00:00
Tao Bao afee8f3036 Skip checking files that have less blocks in block map.
When creating ext4 images with mke2fs, it may skip allocating some
blocks if they contain all zeros. As a result, there could be less
blocks listed in the block map than the actual file length.

For example, for a file with a length of 112200-byte (27+ blocks),
the listed blocks in block.map could be '43665-43688' (24 blocks).
Because some all-zero blocks are not taking actual space.

The generated ext4 images are perfectly valid - kernel will figure out
that data block is not allocated and writes all zeros into user buffer.
However, we can't fully reconstruct a file from its block list in our
Python script. Ideally this can be avoided by mounting or parsing an
ext4 image directly, which is yet to be supported in our script.

This CL skips checking for such files to avoid failing
validate_target_files.py.

Bug: 65213616
Test: validate_target_files.py passes on targets with mke2fs generated
      images (e.g. marlin).
Change-Id: Id9cc59e345b9283844044ef94ceb5702f0ca0526
(cherry picked from commit b418c30e3a)
2017-09-08 11:22:59 -07:00
Jaekyun Seok 106fa4f771 Support excluding overlays when enforcing RRO
PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS will be used to specify overlays
to be excluded from enforcing RRO.

The excluded overlays will be applied into the original package.

Bug: 63600240
Bug: 65001751
Test: succeeded building with
PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS := \
    vendor/google/google_overlay/static_only \
    vendor/google/nexus_overlay/common/static_only
and confirmed that config_webview_packages existed in framework-res.apk
with the overlayed value, but not in framework-res__auto_generated_rro.apk.

Merged-In: I0bfb44fc7726710bb78d9100404bc6dd29d06a73
Change-Id: I0bfb44fc7726710bb78d9100404bc6dd29d06a73
(cherry picked from commit ccee95e6ec)
2017-09-08 10:40:11 +09:00
TreeHugger Robot 4ee9bb6caa Merge "Remove root folder bt_firmware in GSI" into oc-mr1-dev 2017-09-07 14:59:43 +00:00
TreeHugger Robot 032adc13c9 Merge "Revise GSI to inherit from aosp_base.mk and telephony.mk" into oc-mr1-dev 2017-09-07 02:50:17 +00:00
TreeHugger Robot 418b291486 Merge "DO NOT MERGE OC-MR1 is REL" into oc-mr1-dev 2017-09-06 23:46:48 +00:00
Adam Seaton 99dd08dfdd Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b am: bf38f45749 am: 40720f6a25 am: fbd8bcf329 -s ours am: 137d5f095a am: e522ce436f am: 6613b4e6fc am: abf1d733f3 am: 77d8b88c61 -s ours am: 181a73eeb6
am: f84b592ed3

Change-Id: I3ee003f897c1bf3323cb318b9793e302a30d637f
2017-09-06 23:43:30 +00:00
Adam Seaton f84b592ed3 Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b am: bf38f45749 am: 40720f6a25 am: fbd8bcf329 -s ours am: 137d5f095a am: e522ce436f am: 6613b4e6fc am: abf1d733f3 am: 77d8b88c61 -s ours
am: 181a73eeb6

Change-Id: If43281749e89e68fdf6cbc55ec5966da988c9aa9
2017-09-06 23:39:24 +00:00
Adam Seaton 181a73eeb6 Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b am: bf38f45749 am: 40720f6a25 am: fbd8bcf329 -s ours am: 137d5f095a am: e522ce436f am: 6613b4e6fc am: abf1d733f3
am: 77d8b88c61  -s ours

Change-Id: I53c53bd284132418949d4380e7260b700cfecd7e
2017-09-06 23:35:23 +00:00
Adam Seaton 77d8b88c61 Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b am: bf38f45749 am: 40720f6a25 am: fbd8bcf329 -s ours am: 137d5f095a am: e522ce436f am: 6613b4e6fc
am: abf1d733f3

Change-Id: I5ba8a549b8eac9598ea67e0aa53eae5cf7d9b28d
2017-09-06 23:31:23 +00:00
Adam Seaton abf1d733f3 Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b am: bf38f45749 am: 40720f6a25 am: fbd8bcf329 -s ours am: 137d5f095a am: e522ce436f
am: 6613b4e6fc

Change-Id: Ibae3d0687defb616f986ae9b6663a535506a5b8b
2017-09-06 23:27:25 +00:00
Adam Seaton 6613b4e6fc Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b am: bf38f45749 am: 40720f6a25 am: fbd8bcf329 -s ours am: 137d5f095a
am: e522ce436f

Change-Id: I1d9f7c840f236c1a4a009cab84d8ba4a987eeba7
2017-09-06 23:22:54 +00:00
Adam Seaton e522ce436f Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b am: bf38f45749 am: 40720f6a25 am: fbd8bcf329 -s ours
am: 137d5f095a

Change-Id: I7918cab321e5fbd9a1ed2f220387b715f5ae0dbc
2017-09-06 23:18:54 +00:00
Adam Seaton 137d5f095a Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b am: bf38f45749 am: 40720f6a25
am: fbd8bcf329  -s ours

Change-Id: Iab67b2fdd9aac710472268edba1be79161b6e554
2017-09-06 23:14:52 +00:00
Adam Seaton fbd8bcf329 Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b am: bf38f45749
am: 40720f6a25

Change-Id: I8cfa5ccc04fa609f926b27068214ab96c42eb772
2017-09-06 23:10:23 +00:00
Adam Seaton 40720f6a25 Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev am: 84557be29b
am: bf38f45749

Change-Id: I10e741ba36e2f3570d70698fdece3d43dc93ad12
2017-09-06 23:05:23 +00:00
Adam Seaton bf38f45749 Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev
am: 84557be29b

Change-Id: I9289b586b2aa28590dde1cdc90d21a45c4a27dbb
2017-09-06 23:00:22 +00:00
Adam Seaton 84557be29b Merge "[DO NOT MERGE] Update platform security string to 2017-10-01 in mnc-dev Bug:64896113" into mnc-dev 2017-09-06 22:44:40 +00:00
Ian Pedowitz 62a835d0ef DO NOT MERGE OC-MR1 is REL
Bug: 64982450
Test: manual
Change-Id: I054e3ecff49803e61e7741753fe6764a567d72c4
2017-09-06 13:12:42 -07:00
Michael Schwartz c5027d6e7d Merge "Include vbmeta.img into <product>-img.zip" into oc-mr1-dev 2017-09-06 16:47:32 +00:00
SzuWei Lin 558f3dd79b Revise GSI to inherit from aosp_base.mk and telephony.mk
GSI inherited from aosp_base_telephony.mk, but it included some settings for
emulator. So this patch changes to inherit from more pure makefiles to
includes AOSP and telephony modules.

Bug: 65332895
Test: Test on some Pixel devices with GSI, boot to home screen
Change-Id: I98523e864ccf06ddba4422bc8380bc6ff0095d5a
2017-09-06 17:05:08 +08:00
Bowgo Tsai 6bbb11a620 Include vbmeta.img into <product>-img.zip
Bug: 65227202
Test: make dist, checks vbmeta.img is included in <product>-img.zip
Change-Id: I3e09f036441bcf7e98d8f76360df1e17466ae38e
2017-09-06 09:30:32 +08:00
TreeHugger Robot d7314b90bd Merge "Update compatibility matrix logic." into oc-mr1-dev 2017-09-05 20:54:27 +00:00
SzuWei Lin 292b8433cb Remove root folder bt_firmware in GSI
Bug: 64905218
Bug: 36764215
Test: Test on 2 different devices with GSI, and check BT
Change-Id: I5fca470aece7d4b777540da21af601a7cc8dc83e
2017-09-05 11:12:29 +08:00
TreeHugger Robot a93c32e338 Merge "Disable adb authorization in GSI" into oc-mr1-dev 2017-09-04 09:41:10 +00:00
SzuWei Lin 95ddc40d53 Disable adb authorization in GSI
To support test automation, disable adb authorization in GSI.

Applied the patch, and device won't ask for adb authorization after
overriding system image with GSI.

Bug: 64489353
Test: boot up with GSI, and check by 'adb devices'
Change-Id: Ibaa3aaa90a89ae03b8b23abf37f53ede64d15789
2017-09-01 12:00:09 +08:00
Mathieu Chartier b9cd7e6ade Merge "Fix boot image profile in make files" into oc-mr1-dev 2017-09-01 02:47:09 +00:00
Mathieu Chartier 75edf540e2 Fix boot image profile in make files
Update location to framework/base/config instead of frameworks/base

Fixed dex2oat dependency to my_out_boot_image_profile_location
instead of my_out_profile_location.

Bug: 37966211
Test: make and flash

Change-Id: I446f11216cf6342861bbbf56ac5c4da2f36fb755
2017-08-31 12:35:21 -07:00
Steven Moreland 5bce7f201e Update compatibility matrix logic.
Use c_m.<level>.xml for matrices which correspond
to released API levels.

Test: manual
Test: build system complains when files are missing
Bug: 63603463
Change-Id: I16bcab9a7548876ec2bedf9c5d70a126ac50b8d5
2017-08-30 14:48:08 -07:00
Guang Zhu 73c10bed93 add CTS tradefed harness dependencies to PDK fusion config
Bug: 38448863
Test: make platform-java, config zip contains added directories
Change-Id: I49627ff9eac5effecb577b3d93ee0e24b3b4ab83
2017-08-30 12:42:45 -07:00
TreeHugger Robot 73ba8bc61a Merge "Make GSI for arm64_ab more generic" into oc-mr1-dev 2017-08-30 06:43:28 +00:00
Mathieu Chartier e7bda08941 Merge "Allow system server jars for WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY" into oc-mr1-dev 2017-08-29 23:13:32 +00:00
TreeHugger Robot d0734551b7 Merge "Support TimeZoneRulesManagerService in GSI" into oc-mr1-dev 2017-08-29 13:43:42 +00:00
TreeHugger Robot afb81de1f2 Merge "dex_preopt: Use the unstripped jar file for generating profiles." into oc-mr1-dev 2017-08-29 08:43:34 +00:00
Yifan Hong 8fa591d7e5 Merge changes from topic "kernel_config_arch" into oc-mr1-dev
* changes:
  fwk comp mat: add arch specific kernel requirements
  fwk comp mat: use a for loop for supported kernel versions
2017-08-29 07:35:47 +00:00
SzuWei Lin b97fd4e603 Support TimeZoneRulesManagerService in GSI
System Server starts "TimeZoneRulesManagerService" if
"config_enableUpdateableTimeZoneRules" is true in config.xml.

Some projects would turn on "config_enableUpdateableTimeZoneRules"
by resource overlaying in vendor partition.

So, GSI needs to include all required modules for
TimeZoneRulesManagerService.

Bug: 65001751
Test: Build pass and boot with GSI into home screen
Change-Id: Ief929b23411c4fb85633696f47aabd0f065aab91
2017-08-29 09:59:00 +08:00
Mathieu Chartier 418258cee9 Allow system server jars for WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY
Renamed WITH_DEXPREOPT_BOOT_IMG_ONLY to
WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY and changed the
behavior accordingly.

Preopt system server jars since selinux prevents system server from
loading anything from /data. If we don't do this they will need to
be extracted which is not favorable for RAM usage or performance.

Test: make and flash and look at system server maps
Bug: 65122284
Bug: 62356545
Change-Id: I49f2a23337fdd2bc2e628b683d26a0c135b2aabe
2017-08-28 18:40:30 -07:00
Jiyong Park 56b73bb4be Make GSI for arm64_ab more generic
2ND CPU variant is set to generic as it already is for its non-AB
counterpart.

Bug: 65042524
Test: No regression on CTS with arm64_ab GSI
Change-Id: I513444178e663b154d6ccfae763c59a1091b163e
2017-08-29 09:51:00 +09:00
Yifan Hong afbb82b052 fwk comp mat: add arch specific kernel requirements
Test: m system_compatibility_matrix.xml -j
Bug: 64124223
Change-Id: Ieda3ea43e5d3b7d393461bd54b311b58af443f7c
2017-08-28 14:34:21 -07:00
Yifan Hong 0ae807dabb fwk comp mat: use a for loop for supported kernel versions
Test: m system_compatibility_matrix.xml -j

Bug: 64124223
Change-Id: Ife95bfb5b7103239e116df1ae844cc3a643b4c28
2017-08-28 14:22:48 -07:00
TreeHugger Robot a998fd8147 Merge "emulator: fix widevine drm vndbinder denial" into oc-mr1-dev 2017-08-28 05:38:41 +00:00
TreeHugger Robot 9440787d85 Merge "configstore: remove configstore 1.1" into oc-mr1-dev 2017-08-28 04:52:22 +00:00
TreeHugger Robot fe16a507fc Merge "Reduce the system partition size of 32 bits GSI" into oc-mr1-dev 2017-08-28 03:40:09 +00:00
TreeHugger Robot 9d96622be4 Merge "Fix potential build break" into oc-mr1-dev 2017-08-27 23:52:27 +00:00
TreeHugger Robot 0ba9648a13 Merge "O MR1 is API 27" into oc-mr1-dev 2017-08-26 02:29:45 +00:00
bohu 90da258962 emulator: fix widevine drm vndbinder denial
[   86.252399] type=1400 audit(1503684692.153:25): avc: denied { read write } for pid=4160 comm="android.hardwar" name="vndbinder" dev="tmpfs" ino=5163 scontext=u:r:hal_drm_widevine:s0 tcontext=u:object_r:vndbinder_device:s0 tclass=chr_file permissive=0

BUG: 64726466

Test: build sdk_gphone_x86-user target, launch it
and the above denial should be fixed.

Change-Id: Ied1268878236c42fbb0751a0f33014b332d78c32
2017-08-25 11:17:23 -07:00
Sundong Ahn 49f78ff231 configstore: remove configstore 1.1
Configstore was up-revisioned from 1.0 to 1.1. However no new
APIs were added to 1.1. Therefore configstore in mr1 will be down
revisioned to 1.0.

Bug: 64999074
Test: build & run
Change-Id: Ife60328110c6d6cb3e8024fb4a5caabc4c7c034f
2017-08-25 17:06:45 +00:00
Hung-ying Tyan b260f0d557 Fix potential build break
When BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED is enabled, the build system
may attempt to create a symlink in TARGET_ROOT_OUT before TARGET_ROOT_OUT
is created. Also make the symbolic link depend on
INSTALLED_DEFAULT_PROP_TARGET so that the symbolic link is properly created
when only bootimage is made.

Bug: 63645797
Test: on non-A/B device, make installclean && make bootimag and then verify
      that the symbolic link exists at $(TARGET_ROOT_OUT)/default.prop
Change-Id: Ied7b32abd7a5fd5456c4cb5ff68a56debe6254b7
(cherry picked from 58c1b0426f)
2017-08-25 23:24:24 +08:00
bohu 2ab3cf3c1f emulator: fix selinux issues
with cas/camera/drm hals

BUG: 64726466

Test: build aosp_x86-eng, boot emulator
without cas/camera/drm hals killed by
selinux avc denials; camera can take
pictures

Change-Id: I8a154fdb5d7aa7763aab2b912976eb9e1d329cdb
2017-08-24 21:29:56 -07:00
Narayan Kamath bbcdc07d12 dex_preopt: Use the unstripped jar file for generating profiles.
We were previously using LOCAL_BUILT_MODULE, which wouldn't work in the
case that "nostripping" wasn't specified (i.e when we stripped).

The issue is that the built module has its classes.dex entry stripped,
which means that profman can't do anything meaningful with it.

In this change, we use the right set of files for JAVA_LIBRARIES as well
as prebuilt PACKAGES. Fixing apps built from source is a larger task and
has been left for a future change. Depending on ART changes, we might
need to disable stripping for all apps and/or align userdebug and user
builds with each other. This will be tackled separately.

Test: make
Bug: 64896089
Change-Id: I4fd256d187b66763f354cc6001953469c2cd8fbb
2017-08-24 11:31:03 +01:00