Commit Graph

38950 Commits

Author SHA1 Message Date
Michael Schwartz c5027d6e7d Merge "Include vbmeta.img into <product>-img.zip" into oc-mr1-dev 2017-09-06 16:47:32 +00: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
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
SzuWei Lin 2cf1711b9e Reduce the system partition size of 32 bits GSI
Bug: 64458958
Test: Build pass for aosp_arm_ab and aosp_x86_ab
Change-Id: I16e66b1d1a306d7706051a899bae85441d6535ea
2017-08-24 14:14:25 +08:00
Michael Wright 5d8410b60a O MR1 is API 27
Bug: 64982450
Test: manual
Change-Id: I0d59724f1bcb8091488f23cd5d98d2688009b605
2017-08-23 18:23:06 -07:00
Adam Seaton d463548af1 Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f am: feada74524 am: dbe7ec01c6 am: aed422e05b am: e53cb97dcb -s ours am: cde553f1c5
am: 269106b949

Change-Id: I02593920f447956a004461171665a497dfc550f9
2017-08-23 17:04:08 +00:00
Adam Seaton 269106b949 Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f am: feada74524 am: dbe7ec01c6 am: aed422e05b am: e53cb97dcb -s ours
am: cde553f1c5

Change-Id: Ie67c88fcd12874f4728637e3c6121a8500287f0a
2017-08-23 17:01:05 +00:00
Adam Seaton cde553f1c5 Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f am: feada74524 am: dbe7ec01c6 am: aed422e05b
am: e53cb97dcb  -s ours

Change-Id: I7ba7c371d868bcfc306201ad225982893e5b2f40
2017-08-23 16:57:04 +00:00
Narayan Kamath 1d2518a649 Merge "releasetools: Add support for compressed APKs." into oc-mr1-dev 2017-08-23 14:21:31 +00:00
Adam Seaton bf413aa70d Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev am: ce4bc47c74
am: f3ae135ddb

Change-Id: If58e6b190e312f3fd4eb600b18689f396c8efb2f
2017-08-22 22:48:23 +00:00
Adam Seaton 90b1c82d83 Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev am: fce94e0000
am: 834db8c201

Change-Id: I2acc807fc3b4fdaea5592ea0b885cb206284a211
2017-08-22 22:47:53 +00:00
Adam Seaton f3ae135ddb Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev
am: ce4bc47c74

Change-Id: Idc4c93c54a778c37b5d916ef9dc71eaafc8eff89
2017-08-22 22:37:48 +00:00
Adam Seaton 834db8c201 Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev
am: fce94e0000

Change-Id: I26c3283c5fd33ee1e930840ad6b82019eba1ebc6
2017-08-22 22:37:00 +00:00
TreeHugger Robot ce4bc47c74 Merge "Update platform security string to 2017-10-05 in oc-dev Bug:64896113" into oc-dev 2017-08-22 22:26:48 +00:00
TreeHugger Robot fce94e0000 Merge "Update platform security string to 2017-10-01 in oc-dev Bug:64896113" into oc-dev 2017-08-22 22:26:42 +00:00
Adam Seaton e53cb97dcb Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f am: feada74524 am: dbe7ec01c6
am: aed422e05b

Change-Id: Ifd6a64c599d045735f0c85595315679887310f18
2017-08-22 18:33:33 +00:00
Adam Seaton aed422e05b Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f am: feada74524
am: dbe7ec01c6

Change-Id: Ic825ad705088aa62974c4a654b149f06f4b1f848
2017-08-22 18:31:34 +00:00
Adam Seaton dbe7ec01c6 Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev am: e39fa5ef8f
am: feada74524

Change-Id: Ia70e8bd5134e5898dcd9cdf4482e534ade45c718
2017-08-22 18:29:02 +00:00
Adam Seaton feada74524 Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev
am: e39fa5ef8f

Change-Id: I5918c7dfe27bb9b3c7aff031d79d961b08c3b711
2017-08-22 18:26:04 +00:00
TreeHugger Robot e39fa5ef8f Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev
* changes:
  [DO NOT MERGE] Update platform security string to 2017-10-05 in nyc-dev Bug:64896113
  [DO NOT MERGE] Update platform security string to 2017-10-01 in nyc-dev Bug:64896113
2017-08-22 18:19:20 +00:00
Adam Seaton d7234e6329 [Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1 am: dafd187ab5 am: 47c92b6200 -s ours am: bc464d7e8f -s ours am: 5c68c85011 am: f1f39061a7 -s ours am: c5287e96a4 am: 0412b3d0e3 am: 2df41e5dec am: 09ec3bc311 -s ours am: 9dbcf7c176 am: 3eac316736 am: 319003c0d8 am: 2b7d9b23c7 am: ce869d6025 -s ours am: 2633357494
am: 0d76622c59

Change-Id: Iaa4c8ad113f6a42b3e798053c24715f1b3b31396
2017-08-22 17:56:31 +00:00
Adam Seaton 0d76622c59 [Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1 am: dafd187ab5 am: 47c92b6200 -s ours am: bc464d7e8f -s ours am: 5c68c85011 am: f1f39061a7 -s ours am: c5287e96a4 am: 0412b3d0e3 am: 2df41e5dec am: 09ec3bc311 -s ours am: 9dbcf7c176 am: 3eac316736 am: 319003c0d8 am: 2b7d9b23c7 am: ce869d6025 -s ours
am: 2633357494

Change-Id: I93bbf064c336e921374cb7795dc77c31afb9ec09
2017-08-22 17:54:33 +00:00
Adam Seaton 2633357494 [Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1 am: dafd187ab5 am: 47c92b6200 -s ours am: bc464d7e8f -s ours am: 5c68c85011 am: f1f39061a7 -s ours am: c5287e96a4 am: 0412b3d0e3 am: 2df41e5dec am: 09ec3bc311 -s ours am: 9dbcf7c176 am: 3eac316736 am: 319003c0d8 am: 2b7d9b23c7
am: ce869d6025  -s ours

Change-Id: I7bdc25b49ce56f913ba02ce3f2a1ffb8a3ff3d53
2017-08-22 17:52:00 +00:00
Adam Seaton ce869d6025 [Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113 am: f2f5343ba1 am: dafd187ab5 am: 47c92b6200 -s ours am: bc464d7e8f -s ours am: 5c68c85011 am: f1f39061a7 -s ours am: c5287e96a4 am: 0412b3d0e3 am: 2df41e5dec am: 09ec3bc311 -s ours am: 9dbcf7c176 am: 3eac316736 am: 319003c0d8
am: 2b7d9b23c7

Change-Id: Idda8e5aaf54386d08a6e09b439e60212d4184087
2017-08-22 17:48:02 +00:00