Commit Graph

608 Commits

Author SHA1 Message Date
Yabin Cui ad216f840f Merge "Use armv7-a when building sdk." am: 42c9da3ef7
am: 18b83792e3

Change-Id: If44428f4df666fadf446aede178eb572f3f2a4e1
2017-10-24 21:32:01 +00:00
Yabin Cui 42c9da3ef7 Merge "Use armv7-a when building sdk." 2017-10-24 21:18:33 +00:00
Tri Vo 7fd5858547 Merge "Label emulator devicetree dir." am: 8716646d63
am: 73d36f64b1

Change-Id: I3945cb34c9d41a2834b1da85a980ac335bf2fa58
2017-10-24 20:45:38 +00:00
Tri Vo 8716646d63 Merge "Label emulator devicetree dir." 2017-10-24 20:36:22 +00:00
Yabin Cui 1fe7ac7534 Use armv7-a when building sdk.
Bug: http://b/68201917
Test: make sdk.
Change-Id: I7817bc03beb109b4152d3bc751f0d2438cc93e3b
2017-10-24 12:44:13 -07:00
Tri Vo e275275d31 Label emulator devicetree dir.
Bug: 67416435
Test: booted emulator and checked that
/sys/bus/platform/devices/ANDR0001:00/properties/android/ is labeled
as sysfs_dt_firmware_android
Change-Id: Ib90552b1ccaa8ddcc389e6829221ba63075df7ed
2017-10-20 16:26:22 -07:00
SzuWei Lin 00033a8bfd Merge "Add make_f2fs into GSI" into oc-mr1-dev
am: 4c06d64955

Change-Id: I4a055848eb7652ecc567b9036976510b42a4fb5d
2017-10-19 17:41:34 +00:00
SzuWei Lin c867f1b681 Add make_f2fs into GSI
The userdata partition of some devices is formatted in f2fs,
and could be formatted in runtime. This is a configurable
feature of AOSP, so GSI enables the setting:

    TARGET_USERIMAGES_USE_F2FS

to support it.

Bug: 67916560
Bug: 66925248
Test: build pass and check the make_f2fs in the image
Test: boot a pixel device with GSI to home screen
Change-Id: Id350c4e07a9c0dc0f0a547b3146626053c88b8ab
2017-10-19 02:07:35 +00:00
Mathieu Chartier 6c1aa4584a Merge "Allow system server jars for WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY"
am: dcb1f24e9b

Change-Id: I4cc653c7d4218d2e4b983f4ec1b6f8df77b2d1f4
2017-10-12 22:37:24 +00:00
Mathieu Chartier f834eccd52 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

(cherry picked from commit 418258cee9)

Merged-In: I2e70c80a86327b455450b95144f21020e7bf0c6f
Change-Id: I316e79c7c6d45e2ccbfff4065137cc3ef9d2738e
2017-10-12 20:40:41 +00:00
Jiyong Park bc8a222efe Merge "Don't reserve size for bad blocks when checking image size"
am: dd68a6cb74

Change-Id: Ibea8f1f19b6ec4a3cf1969dde726a90265439128
2017-10-06 19:55:45 +00:00
Treehugger Robot dd68a6cb74 Merge "Don't reserve size for bad blocks when checking image size" 2017-10-06 19:40:29 +00:00
Jeff Vander Stoep 222a2e511b Merge "sepolicy: add owners file" am: 750b8e84c1 am: 8bd17a1df4
am: c4e07ce19b

Change-Id: Icf67bc129db832b7d4c88bd7646597adfdc4e250
2017-10-06 04:37:54 +00:00
Jeff Vander Stoep 8bd17a1df4 Merge "sepolicy: add owners file"
am: 750b8e84c1

Change-Id: I9cad69598bd74e3136fb9780e725b95d67c10823
2017-10-06 04:30:08 +00:00
Treehugger Robot 750b8e84c1 Merge "sepolicy: add owners file" 2017-10-06 04:25:27 +00:00
TreeHugger Robot fbac2f14b9 Merge "Remove world writable sysfs files" into oc-mr1-dev-plus-aosp 2017-10-06 00:09:19 +00:00
Jeff Vander Stoep 10c69455c0 Remove world writable sysfs files
Test: build
Change-Id: I8c4b705726af8629413c5563c2cdba07d9815661
Merged-In: I9d18d31a9a65f785cf4bc69f011990e9f8182228
2017-10-05 15:38:40 -07:00
Jeff Vander Stoep 381f4ea490 sepolicy: add owners file
Test: build
Change-Id: Ic11f283d3d1eeb2fec8b4745d7c0bc647cb7e717
2017-10-05 14:52:12 -07:00
Jeff Vander Stoep bb7ece439b Remove world writable sysfs files
Test: build
Change-Id: I9d18d31a9a65f785cf4bc69f011990e9f8182228
2017-10-05 14:50:17 -07:00
Jiyong Park 4b61a94f70 Don't reserve size for bad blocks when checking image size
When checking *.img size with the partition size, the build system
reserves additional bits for spare bits and spare bad blocks.

However, for emmc and ufs, the space bits and blocks are entirely
managed by the underlying controller and thus not visible from outside
of the controller. In fact the check routine was made for legacy MTD
storages where raw flash blocks are directly exposed.

This makes the size checking a little bit conservative in modern devices.
Builds were failed even though the *.img can actually fit into the
partition. To handle this problem, the additional size is no longer
reserved when checking *.img size with the partition size.

This change also removes following build flags that are meaningful
only for devices having MTD storages:
BOARD_NAND_PAGE_SIZE
BOARD_NAND_SPARE_SIZE
Further use of them breaks the build

Bug: 35790399
Bug: 66399382
Test: build

Merged-In: I954bf261441b53844e75d05788866f1692a2ad43
Change-Id: I954bf261441b53844e75d05788866f1692a2ad43
2017-10-05 09:32:01 +09:00
Jeff Vander Stoep 0ce25ee468 Remove sysfs_writable type
It's not used.

Test: build and boot aosp_x86 emulator. No selinux denials.
Change-Id: Ibfc8bfc4f930bac006c86cc05009dc96e78bcf48
2017-10-04 16:43:13 -07:00
Jeff Vander Stoep 178d04e39c allow setting opengles property
Addresses:
avc:  denied  { set } for property=ro.opengles.version
scontext=u:r:qemu_props:s0 tcontext=u:object_r:opengles_prop:s0
tclass=property_service

Test: build
Change-Id: Ia7445344726b941ad153a126dfe66df4bc8536ab
2017-10-04 16:12:36 -07:00
Jiyong Park 03eb06150b Don't reserve size for bad blocks when checking image size
When checking *.img size with the partition size, the build system
reserves additional bits for spare bits and spare bad blocks.

However, for emmc and ufs, the space bits and blocks are entirely
managed by the underlying controller and thus not visible from outside
of the controller. In fact the check routine was made for legacy MTD
storages where raw flash blocks are directly exposed.

This makes the size checking a little bit conservative in modern devices.
Builds were failed even though the *.img can actually fit into the
partition. To handle this problem, the additional size is no longer
reserved when checking *.img size with the partition size.

This change also removes following build flags that are meaningful
only for devices having MTD storages:
BOARD_NAND_PAGE_SIZE
BOARD_NAND_SPARE_SIZE
Further use of them breaks the build

Bug: 35790399
Bug: 66399382
Test: build

Merged-In: I954bf261441b53844e75d05788866f1692a2ad43
Change-Id: I954bf261441b53844e75d05788866f1692a2ad43
2017-10-04 21:25:08 +09:00
SzuWei Lin 3f3e31a185 Merge "Change aosp_arm_(a|ab) to 768MB" into oc-mr1-dev
am: cb71f5706e

Change-Id: I6db46408beb60356cedc6c8d757201d195e7d4bd
2017-09-29 03:56:37 +00: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
Jiyong Park b77f08e791 DO NOT MERGE: Fix incorrect TARGET_2ND_CPU_VARIANT for A/B devices
am: 8f7bc0e6bd

Change-Id: I84dc8ca8cec580cc424f7458268fbc23a389ba8b
2017-09-22 00:12:10 +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
SzuWei Lin 7e43c0195a Merge "Disable VNDK runtime checking" into oc-mr1-dev
am: febdef4e87

Change-Id: I34bbb9a0aac5b1ace8b284d3ad7833a35567f465
2017-09-20 08:43:04 +00: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
Isaac Chen 1c1a6c9281 Merge "Set default size for 32-bit GSI to 1 GB" into oc-mr1-dev
am: 113fbe4468

Change-Id: Id02b4a81e61252c293b1a64707a0bf5de5bfc818
2017-09-18 04:37:16 +00: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
Björn Davidsson ab5bceaedc Merge "DO NOT MERGE: Fix incorrect TARGET_2ND_CPU_VARIANT for non-A/B devices" into oc-mr1-dev
am: bc6d7783b8

Change-Id: Id3df3cbbc68dc2ec539609bf7e5dac24e4fea8e1
2017-09-16 08:05:42 +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
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
Steve Muckle cf990d5acb Merge "get kernel configs from kernel/configs" am: b4a3124822 am: 634ab481da
am: dff8364c97

Change-Id: I812356c0ed726c563ff4443317cdb5c74055d025
2017-09-13 21:51:12 +00:00
Steve Muckle 634ab481da Merge "get kernel configs from kernel/configs"
am: b4a3124822

Change-Id: Ib6a306a7bf4725e4030893bdb24d2de394fb38be
2017-09-13 21:08:28 +00:00
Steve Muckle b4a3124822 Merge "get kernel configs from kernel/configs" 2017-09-13 19:33:19 +00:00
Steve Muckle 378c2bb42a get kernel configs from kernel/configs
The kernel configs have moved out of VTS and into their own
repository.

Test: build and boot
Change-Id: I649af63216e7b18604586f70396bceff626c30d0
2017-09-12 16:26:28 -07:00
Steven Moreland 2db554e2b7 Merge "aosp_arm64_ab is vndk" am: f38900dc92 am: 16d7c08dab
am: 606c19ecf8

Change-Id: I94480dfdfb5a91f74d638d3851099ce37d9f3e5e
2017-09-12 22:16:27 +00:00
Steven Moreland 16d7c08dab Merge "aosp_arm64_ab is vndk"
am: f38900dc92

Change-Id: I09157be57b71386912b0b96b9748932c30813acd
2017-09-12 19:48:12 +00:00
SzuWei Lin 981a41ed2b Merge "Remove root folder bt_firmware in GSI" into oc-mr1-dev
am: 4ee9bb6caa

Change-Id: I668f32c255004ed205634f5c91d7ca3473f1e582
2017-09-07 15:08:07 +00:00
TreeHugger Robot 4ee9bb6caa Merge "Remove root folder bt_firmware in GSI" into oc-mr1-dev 2017-09-07 14:59:43 +00:00
Steven Moreland fdce598ed8 aosp_arm64_ab is vndk
Test: builds with BOARD_VNDK_VERSION=current
Test: test only one product is using this w/ multiproduct_kati
Bug: 65375837
Merged-In: I972ab897a8bc23ba5c5f6bf133db0017e4334f40
Change-Id: I972ab897a8bc23ba5c5f6bf133db0017e4334f40
2017-09-05 22:31:30 +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
SzuWei Lin 4aad28e830 Merge "Disable adb authorization in GSI" into oc-mr1-dev
am: a93c32e338

Change-Id: I50cc2f03ca950f6e769193bdb473e6bb73843ed2
2017-09-04 09:54:43 +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
Bo Hu 35149ca0b7 Merge changes from topic "aosp-emulator-oc"
* changes:
  emulator: fix widevine drm vndbinder denial
  emulator: fix selinux issues
  emulator: squash misc modifications from oc-emu-dev
  emualtor: keep libopenjdkjvmti*.so on sdk images
  emulator: move rild.libpath to vendor
  sdk:enable emulator to launch in build environment
  build-emulator: fully treblize emulator image
  Build vendor image for emulator
2017-08-31 22:56:31 +00:00
bohu dc745a9090 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
Merged-In: Ied1268878236c42fbb0751a0f33014b332d78c32
2017-08-30 17:13:55 -07:00
bohu 913a990249 emulator: fix selinux issues
with cas/camera/drm hals

BUG: 64726466

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

Change-Id: I8a154fdb5d7aa7763aab2b912976eb9e1d329cdb
Merged-In: I8a154fdb5d7aa7763aab2b912976eb9e1d329cdb
2017-08-30 17:13:51 -07:00