Commit Graph

3173 Commits

Author SHA1 Message Date
Bowgo Tsai 7912a9e760 Removing keystore.default from core_tiny.mk and core_minimal.mk
keystore.default is not the current default implementation
and is not needed on running devices.

Bug: 65613798
Test: boot device

Change-Id: Ide82473d358719f7e01cd2a4a85db954f3722f14
2017-10-17 18:22:51 +08:00
Mathieu Chartier 6a8fb8f75a Merge changes from topic "move_to_go_defaults_512" into oc-mr1-dev
am: 241539e1ae

Change-Id: Icbce5fed1a6602f12d31f2ac31544b4bbfa53c76
2017-10-16 18:29:59 +00:00
Mathieu Chartier 8f8fe3ee4b Split go_defaults into a 512 version and a normal version
am: 7267676258

Change-Id: I0ad8724097e27c35bded48f0db5a69bdc659d363
2017-10-16 18:29:33 +00:00
Mathieu Chartier 120a1bdad1 Add some properties to go_defaults_512.mk
Add lmkd tuning and madvise random hints.

Bug: 67374015
Test: make, flash, look at properties

Change-Id: Id5dfcc28ac9ea1b84f761f1b75ace45f12c47918
2017-10-15 20:22:12 -07:00
Mathieu Chartier 7267676258 Split go_defaults into a 512 version and a normal version
Added go_defauls_common.mk for settings common to both 512 and other
Go devices. Added go_defaults_512 for 512MB RAM devices.

Bug: 67374015
Test: make, flash, look at properties
Change-Id: I160118e397a2f53d64df4a6d8e77aec3553fa401
2017-10-15 20:13:06 -07:00
Elliott Hughes 51ec0bda61 Merge "external/svox is going away." am: ff806ece8d am: 635febc86f
am: 1a79b21385

Change-Id: I74ec971eab347967e5ffde3246ee58b402e6414f
2017-10-15 03:33:13 +00:00
Elliott Hughes d857603851 Merge "Remove PicoTTS from the base." am: 05cf348722 am: 529f794352
am: 891ea7806a

Change-Id: Ic237c6af78ecaf6ae0c21b11c1da060a84ed8532
2017-10-15 03:28:36 +00:00
Bowgo Tsai 0e1ada16ce Merge "Adding Android verified boot 1.0 metadata into ENG builds" am: 5f958ccad5 am: 86c4f8ed54
am: 08a05cd9ae

Change-Id: Ie7471976439616452b0c830b19471be1748a750a
2017-10-15 03:26:24 +00:00
Elliott Hughes 1a79b21385 Merge "external/svox is going away." am: ff806ece8d
am: 635febc86f

Change-Id: I68bfc2d6bd4989b8311fd039ff65d0942772cfda
2017-10-15 03:14:52 +00:00
Elliott Hughes 891ea7806a Merge "Remove PicoTTS from the base." am: 05cf348722
am: 529f794352

Change-Id: I63e841f191aa423b68b42de8a300c27169cb6153
2017-10-15 03:10:29 +00:00
Elliott Hughes 635febc86f Merge "external/svox is going away."
am: ff806ece8d

Change-Id: I1c3fa0d99c6cf53c6266e7c775addcbde56114f9
2017-10-15 03:09:30 +00:00
Bowgo Tsai 08a05cd9ae Merge "Adding Android verified boot 1.0 metadata into ENG builds" am: 5f958ccad5
am: 86c4f8ed54

Change-Id: I3fcdd659de74524b694e16581aaeea2d412245e0
2017-10-15 03:08:02 +00:00
Elliott Hughes 529f794352 Merge "Remove PicoTTS from the base."
am: 05cf348722

Change-Id: I4a2417544509e330ca296455fcc0d276578227a7
2017-10-15 02:50:07 +00:00
Bowgo Tsai 86c4f8ed54 Merge "Adding Android verified boot 1.0 metadata into ENG builds"
am: 5f958ccad5

Change-Id: I54405288a18db3940b0721d5638127e66b7cac3e
2017-10-15 02:48:17 +00:00
Elliott Hughes 271f6ffa04 external/svox is going away.
Bug: N/A
Test: builds
Change-Id: I2583ebd8bc745fb76397e44e214c730863e55700
2017-10-13 15:41:35 -07:00
Elliott Hughes 05cf348722 Merge "Remove PicoTTS from the base." 2017-10-13 17:26:25 +00:00
Treehugger Robot 5f958ccad5 Merge "Adding Android verified boot 1.0 metadata into ENG builds" 2017-10-13 03:39:21 +00:00
Mathieu Chartier 947d60cc7d Merge "Allow system server jars for WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY" am: dcb1f24e9b
am: 6c1aa4584a

Change-Id: I8e35d3a88477345d5ce0d12c435d58978889587f
2017-10-12 22:42:06 +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
Elliott Hughes 61f7ee9386 Remove PicoTTS from the base.
Bug: N/A
Test: builds
Change-Id: I843383d8298ded51510f993168efd9189d4c176b
2017-10-12 09:11:29 -07:00
Bowgo Tsai 6ceeb1a8bf Adding Android verified boot 1.0 metadata into ENG builds
Adding verified boot metadata with a "disable magic". The resulting
metadata at the end of each image (e.g., system.img, vendor.img) will
be the same as triggering an "adb disable-verity" on an USERDEBUG image.

This can help simplify the code on fs_mgr, which won't have to check if
current image is an ENG build or not.

Bug: 63056044
Test: boot sailfish eng/userdebug builds
Change-Id: I95d23ac7b76c04d6d4483c9c4dc1de16bf0d9c3a
2017-10-12 10:08:44 +08:00
Mathieu Chartier e031f9e30a Merge "Add Android Go defaults make file" into oc-mr1-dev
am: a78549885e

Change-Id: I77652178df4d7e80120db3326d8e6a1ffa64299c
2017-10-07 00:22:38 +00:00
Jiyong Park ec5aacff60 Merge "Don't reserve size for bad blocks when checking image size" am: dd68a6cb74
am: bc8a222efe

Change-Id: Ia06ceb9fc418f265bff2aaf05aaf2625023e3698
2017-10-06 20:02:17 +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 c4e07ce19b Merge "sepolicy: add owners file" am: 750b8e84c1
am: 8bd17a1df4

Change-Id: I71ee28591bbffa6a9ed018605e7b03815788c525
2017-10-06 04:34:04 +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
Jeffrey Vander Stoep 1a32fd3379 Merge "Remove world writable sysfs files" into stage-aosp-master
am: 8d7af382bb

Change-Id: Ie1f0c85df711a106ace33700fe9cb736100ff9d7
2017-10-06 00:33:25 +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
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
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
Hung-ying Tyan 32aeb3f175 Merge "GSI: add the messaging app" into oc-mr1-dev
am: 90e737c6b6

Change-Id: Id1caf3f5d802843be0b0a51f234bceef5fbd9695
2017-09-30 02:15:57 +00:00
Dan Willemsen 69bcd308ff Enforce TARGET_USES_MKE2FS := true for new devices
am: e49ee7095f

Change-Id: I0a79501423f055a87d18fcc73e03492be944a155
2017-09-30 02:14:49 +00: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
SzuWei Lin eaba5765cc resolve merge conflicts of 40ef25d7bd to stage-aosp-master
am: 0ab6b24e07

Change-Id: Ie811ebe6b5af696681cd8522d83280ef414eaef2
2017-09-29 10:07:57 +00:00
Mathieu Chartier 2cbb80d5b4 Merge "Update paths for frameworks/base/config" am: e984c78faf
am: e3196ada4c

Change-Id: I75c6489adc15dcb819e1a8034f0764cdc49019d3
2017-09-29 08:21:21 +00:00
SzuWei Lin 0ab6b24e07 resolve merge conflicts of 40ef25d7bd to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I39cf0099b857d38222a81c7be41ec13cebb1fb7a
2017-09-29 15:51:45 +08:00
Treehugger Robot 40ef25d7bd Merge "Apply vndk_package to generic system image" 2017-09-29 06:35:50 +00: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
Mathieu Chartier e3196ada4c Merge "Update paths for frameworks/base/config"
am: e984c78faf

Change-Id: I44a5cb37d1d05a3b7619e04e661f9cca8d9b3fde
2017-09-29 00:20:46 +00:00
Mathieu Chartier d83a7f1fdb Update paths for frameworks/base/config
Bug: 64259751
Test: make

(cherry picked from commit 37ba2d97df)

Change-Id: Iac1f92d1e4126d088b691c46a0b858e9e9bfb1a4
Merged-In: Ie159ef9f3f96d7ecd22429327a64161bd63f525b
2017-09-28 17:54:20 +00:00
SzuWei Lin e5c62213c5 Apply vndk_package to generic system image
Add vndk_package into PRODUCT_PACKAGES, which includes
HAL interfaces, VNDK, VNDK-SP and LL-NDK.

Bug: 64654641
Bug: 65614701
Test: build pass
Change-Id: I8d8a02d88604d4287a519b698328a50dc11d819d
2017-09-28 15:26:44 +08: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
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
Dan Willemsen 33378ce90a Merge "Fix mips emulator boot" am: 557eae2175 am: fea7b1efb1
am: 9fb36911a6

Change-Id: Ica004a55750906ea64e7226cf1aa7324f204df45
2017-09-25 22:41:51 +00:00
Dan Willemsen 9fb36911a6 Merge "Fix mips emulator boot" am: 557eae2175
am: fea7b1efb1

Change-Id: I4fdb0c8c8a54135cd057161314eee56a21c58e08
2017-09-25 22:35:48 +00:00
Dan Willemsen fea7b1efb1 Merge "Fix mips emulator boot"
am: 557eae2175

Change-Id: I8207e6e48ea8867ed77f534e886aeb7f9c5419db
2017-09-25 22:32:08 +00:00
Dan Willemsen 557eae2175 Merge "Fix mips emulator boot" 2017-09-25 22:18:52 +00: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
Calin Juravle eecf73f217 Merge "Set the default value of pm.dexopt.shared to speed" into oc-mr1-dev
am: f7517503da

Change-Id: I7f55708530b444065cd9056f9a59aa50718d19fa
2017-09-19 22:10:11 +00: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
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
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
Jiyong Park 45fe5028ef Merge "add llndk|vndksp.libraries.txt to vndk_package" into oc-mr1-dev
am: 5df8ae4bf6

Change-Id: I390407cf0829822168d0442da9f3cef8537eb648
2017-09-14 14:50:31 +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
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 dff8364c97 Merge "get kernel configs from kernel/configs" am: b4a3124822
am: 634ab481da

Change-Id: I89c19207e4a8792f38891e9dd88b7fcc160f6efe
2017-09-13 21:20:27 +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 606c19ecf8 Merge "aosp_arm64_ab is vndk" am: f38900dc92
am: 16d7c08dab

Change-Id: I27e880056b846e8781b665433c33d59268a8e670
2017-09-12 20:00:24 +00:00
Steven Moreland 16d7c08dab Merge "aosp_arm64_ab is vndk"
am: f38900dc92

Change-Id: I09157be57b71386912b0b96b9748932c30813acd
2017-09-12 19:48:12 +00:00
Jaekyun Seok 43a1aad136 Merge "Revert "Support TimeZoneRulesManagerService in GSI"" into oc-mr1-dev
am: 777d6a036b

Change-Id: I84437cb46261553754251f40b003fa55ad569bf1
2017-09-09 02:35:34 +00:00
TreeHugger Robot 777d6a036b Merge "Revert "Support TimeZoneRulesManagerService in GSI"" into oc-mr1-dev 2017-09-09 02:28:40 +00:00
Jaekyun Seok f89dc8488d Revert "Support TimeZoneRulesManagerService in GSI"
This reverts commit b97fd4e603.

Bug: 65001751
Test: no tests
Change-Id: Ia48de712dff393671cd9ce4a9e040ebc16407aa9
2017-09-08 22:22:21 +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
SzuWei Lin 980eb21f47 Merge "Revise GSI to inherit from aosp_base.mk and telephony.mk" into oc-mr1-dev
am: 032adc13c9

Change-Id: I062c199c41bb80d82a358106afa20497ea857fc3
2017-09-07 15:00:53 +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
Jiyong Park 686aff5b91 add llndk|vndksp.libraries.txt to vndk_package
Bug: 64882323
Test: build 2017 pixel devices. check the files are under /system/etc.

Change-Id: I488427f796b770bb2d151cfa49f73d323cafbc9f
2017-09-07 11:51:27 +09:00
TreeHugger Robot e8d229c70f Merge "configstore: remove configstore 1.1" into oc-dr1-dev-plus-aosp 2017-09-07 01:09:31 +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
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
Miodrag Dinic 0297f39904 Fix mips emulator boot
The following commit introduced regression:
    7b5e1ab emulator: squash misc modifications from oc-emu-dev

Emulators for mips should also use unencrypted data partition like arm.
Encryption is only enabled for Intel.

Change-Id: I3dba08621d8f679a707f516fff735bba31bfc629
Signed-off-by: Miodrag Dinic <miodrag.dinic@imgtec.com>
2017-09-01 17:07:28 +02:00
Sundong Ahn 43e711962e configstore: remove configstore 1.1
Configstore was down-revisioned from 1.1 to 1.0 in oc-dr1-dev,
oc-mr1-dev and oc-mr1-dev-plus-aosp. Therefore configstore in
oc-dr1-dev-plus-aosp will also be down-revisioned to 1.0.

Bug: 65124635
Test: build & boot test on sailfish + walleye
Change-Id: Ife60328110c6d6cb3e8024fb4a5caabc4c7c034f
Merged-In: I90d30584ad4499d4e20254be2974d9de1d3883c0
2017-09-01 05:38:25 +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
Lev Rumyantsev 47c84825c1 Merge "Move default native bridge value to build.prop" am: e7a0516835 am: 77492a72a2
am: 76e2b22796

Change-Id: Id41033af929bbdd8c9bab4b8f24debaeb502cc1a
2017-08-31 22:34:28 +00:00
Lev Rumyantsev 77492a72a2 Merge "Move default native bridge value to build.prop"
am: e7a0516835

Change-Id: I34f92daf8fade009b524505e51d162a78d205ac3
2017-08-31 22:16:56 +00:00
Lev Rumyantsev be80acfd1a Move default native bridge value to build.prop
Before this change it was part of default.prop, which is applied
before init.rc is executed, so that scripts cannot override the property.

In contrast, build.prop is applied at "init-late" stage,
so that one has a chance to override the property in scripts using
"init" or "init-early" triggers.

(cherry-picked from 74b2da9db67f5da2195c9b07dab22c868934e396)

Test: fugu still works
Bug: 63133475
Merged-In: I0842abaaec1d353ebe4debda6dfe3e2c42146786
Change-Id: I0842abaaec1d353ebe4debda6dfe3e2c42146786
2017-08-31 12:13:37 -07: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
bohu 7b5e1abacb emulator: squash misc modifications from oc-emu-dev
Change-Id: I7380292cd4dc851a987683bdf61d511dbf74aff6
Merged-In: I7380292cd4dc851a987683bdf61d511dbf74aff6
2017-08-30 17:13:47 -07:00
bohu bc43c4ec29 emulator: move rild.libpath to vendor
BUG: 62137708
Test: buld sdk_gphone_x86-user, launch
emulator make sure radio works

Change-Id: I4ef1483a8d95a74b54deb6f0d4b2461c733c8140
Merged-In: I4ef1483a8d95a74b54deb6f0d4b2461c733c8140
2017-08-30 17:13:37 -07:00
bohu ac0273f162 sdk:enable emulator to launch in build environment
Recent changes in emulator requires advancedFeatures.ini,
encryptionkey.img and new kernels (such as 3.18) at OUT directory
so emulator can find them.

This CL set those up as part of the build process.

Change-Id: Ib3b7c4c48a22cecb44255e643402fd1c37797522
Merged-In: Ib3b7c4c48a22cecb44255e643402fd1c37797522
2017-08-30 17:13:32 -07:00
bohu e3f4e9f025 build-emulator: fully treblize emulator image
Install emulator specific binaries and libraries
to vendor partition; update selinux; add vndk.

BUG: 37511975

Test: build user build, launch emualtor, run CTS.

Change-Id: I70f58947e98b41b195d77b4347d2efdc09348392
Merged-In: I70f58947e98b41b195d77b4347d2efdc09348392
2017-08-30 17:13:26 -07:00
Yahan Zhou 3cf7441dbe Build vendor image for emulator
BUG: 37511975

Test: lunch sdk_gphone_x86-user, make with dist option, unzip
sdk_gphone_x86-emulator-eng.xxxx.zip to system image folder, emulator
can boot

Change-Id: I75b9f0de17fece3dec5ae1662400808af321bd4d
Merged-In: I75b9f0de17fece3dec5ae1662400808af321bd4d
2017-08-30 17:13:20 -07:00
Jiyong Park 694cd435f2 Merge "Make GSI for arm64_ab more generic" into oc-mr1-dev
am: 73ba8bc61a

Change-Id: I149232baf4306f5ceed588fd74112fff709d58a7
2017-08-30 06:55:51 +00: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 6ca93efd0e Merge "Allow system server jars for WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY" into oc-mr1-dev
am: e7bda08941

Change-Id: I6d2a5f7bfabe793a53b255edab1f15ba1399601f
2017-08-29 23:22:18 +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
Yifan Hong fd8eded8f9 Merge changes from topic "kernel_config_arch"
am: 4b7cbf8395

Change-Id: Ic48088745d443c39cdea9d967412e21af2d28107
2017-08-29 18:34:48 +00:00
SzuWei Lin ce34b695b6 Merge "Support TimeZoneRulesManagerService in GSI" into oc-mr1-dev
am: d0734551b7

Change-Id: I021d9c4e66bbc98f7bd8f0de2e714d32182663a0
2017-08-29 13:53:16 +00:00
TreeHugger Robot d0734551b7 Merge "Support TimeZoneRulesManagerService in GSI" into oc-mr1-dev 2017-08-29 13:43:42 +00:00
Yifan Hong f14b786414 Merge changes from topic "kernel_config_arch" into oc-mr1-dev
am: 8fa591d7e5

Change-Id: I51c0e6455748197268c588a9b9919f74dc6b70b9
2017-08-29 07:45:26 +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 63e264d142 fwk comp mat: add arch specific kernel requirements
Test: m system_compatibility_matrix.xml -j
Bug: 64124223
Change-Id: Ieda3ea43e5d3b7d393461bd54b311b58af443f7c
Merged-In: Ieda3ea43e5d3b7d393461bd54b311b58af443f7c
2017-08-28 17:32:59 -07:00
Yifan Hong a508b30df5 fwk comp mat: use a for loop for supported kernel versions
Test: m system_compatibility_matrix.xml -j

Bug: 64124223
Change-Id: Ife95bfb5b7103239e116df1ae844cc3a643b4c28
Merged-In: Ife95bfb5b7103239e116df1ae844cc3a643b4c28
2017-08-28 17:32:59 -07:00
bohu f4290a4ef0 Merge "emulator: fix widevine drm vndbinder denial" into oc-mr1-dev
am: a998fd8147

Change-Id: Ie6ffacc25c7c98b1b9e470484f7140b94d8b9a7c
2017-08-28 23:50:31 +00:00
Sundong Ahn 3bcefd82db DO NOT MERGE: Merge commit '9440787d85a100bb182dee3e69bb1acaec65879e' into manual_merge
Change-Id: I90d30584ad4499d4e20254be2974d9de1d3883c0
2017-08-28 21:35:01 +00: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
SzuWei Lin 523a1cbc80 Merge "Reduce the system partition size of 32 bits GSI" into oc-mr1-dev
am: fe16a507fc

Change-Id: I5f9d529fe2d3e2c2b88b8eb0ead573ccac1443a7
2017-08-28 03:44:41 +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
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
bohu fe07097cc1 emulator: fix selinux issues
am: 2ab3cf3c1f

Change-Id: Ibcb179ffe261589aa3aac4f9fdfcb5c726ad5cdd
2017-08-25 07:16:48 +00: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
Isaac Chen 6d91469c13 Merge "Revert "Revert "Build support for 32-bit armv8-a""" am: 9a888ebb51 am: 9f55141c5f
am: 26704591f3

Change-Id: If9bde7eb9afb7ef392b3bfb9fabffd5127b6543f
2017-08-25 02:24:35 +00:00
Isaac Chen 9f55141c5f Merge "Revert "Revert "Build support for 32-bit armv8-a"""
am: 9a888ebb51

Change-Id: I4f0b7b55de9a0b79d9f81f4aaa6c04ebd1e409b1
2017-08-25 02:03:26 +00:00
Isaac Chen 9a888ebb51 Merge "Revert "Revert "Build support for 32-bit armv8-a""" 2017-08-25 01:55:56 +00:00
Yifan Hong 0998353f08 Merge changes from topic "libvintf_cp"
am: 9bab2f5fa2

Change-Id: If2a7759c2d2f2596417814383a6a8aff91bceaa9
2017-08-24 19:53:47 +00:00
Yifan Hong 1aecc84239 Add <kernel> entry to fwk compat mat.
Test: builds and verify that system/compatibility_matrix.xml
      has configs filled.
Test: `vintf | tail` on marlin shows that fwk compat mat
      is compatible with runtime info.

Bug: 38324908
Change-Id: I8a35ea582fea1faa083c409ec58813c3ac82dc9c
Merged-In: I8a35ea582fea1faa083c409ec58813c3ac82dc9c
2017-08-24 11:28:04 -07:00
Bowgo Tsai eb7b438994 Pass FRAMEWORK_VBMETA_VERSION to assemble_vintf
Note that this depends on a change in avbtool:
  https://android-review.googlesource.com/#/c/406374/

Bug: 38325029
Test: builds system.img, checks $OUT/system/compatibility_matrix.xml
      contains correct vbmeta-version
Change-Id: Iacc0a2687fb39600ad6b8e9cfbfe5c1a3b90b40b
Merged-In: Iacc0a2687fb39600ad6b8e9cfbfe5c1a3b90b40b
2017-08-24 11:28:04 -07:00
Yifan Hong dae462bdd1 Accept multiple input files for device manifest.
Test: test with DEVICE_MANIFEST_FILE variable split
      into multiple files

Bug: 38217107
Change-Id: I1146898e4ccf0e8bac7d8541032f160476dbc148
Merged-In: I1146898e4ccf0e8bac7d8541032f160476dbc148
2017-08-24 11:28:02 -07: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
Jeff Vander Stoep 90af004fa6 Merge "embedded.mk: move dependencies to sepolicy" am: d6c7681d85 am: 1c71c880e9
am: 0ed1778038

Change-Id: I82ab77f5bdae8496742b6dd2b40270d24a4b9622
2017-08-23 22:09:09 +00:00
Jeff Vander Stoep 1c71c880e9 Merge "embedded.mk: move dependencies to sepolicy"
am: d6c7681d85

Change-Id: I23df5e25c31963e3119bd38ee1d90bb70df45e08
2017-08-23 21:58:21 +00:00
Isaac Chen f5af850a29 Revert "Revert "Build support for 32-bit armv8-a""
This reverts commit 7de79cbeaf.

Fixed CTS build issue by adding -march=armv7-a in cts/tests/tests/os/jni/Android.mk since the library built here needs/uses instruction (swp) obsolete in ARMv8.

Bug: 64964151
Test: lunch aosp_arm64-userdebug; make -j cts
      lunch aosp_x86-userdebug; make -j cts
      lunch aosp_sailfish-userdebug; make -j cts
      lunch aosp_bullhead-userdebug; make -j cts

Change-Id: Ic3a121600da8e2a9a2d5176b9680cd18ce457959
2017-08-23 10:58:57 +00:00
Jeff Vander Stoep f4941eb4a7 embedded.mk: move dependencies to sepolicy
Some selinux build packages are defined in embedded.mk,
others are defined in system/sepolicy/Android.mk. Move all
to sepolicy as a dependency of the phony package selinux_policy
which is defined in embedded.mk.

Test: build Marlin (Treble) and Angler (non-Treble)
Merged-In: I734c2909354349d146c6f78beb74bd990d9af30d
Change-Id: I734c2909354349d146c6f78beb74bd990d9af30d
2017-08-23 05:26:32 +00:00
Tobias Thierer e7c468f156 Merge "Revert "Build support for 32-bit armv8-a"" am: 1da1c6d056 am: 0d35b9fba3 am: ff4ba02d5b
am: bc9829fb3f

Change-Id: If2462f36e946ac62143ae52d0952f2bfc74f2115
2017-08-22 10:54:38 +00:00
Tobias Thierer bc9829fb3f Merge "Revert "Build support for 32-bit armv8-a"" am: 1da1c6d056 am: 0d35b9fba3
am: ff4ba02d5b

Change-Id: I1d112aad1ebb715fa4990db53ed1347a9e8bf11c
2017-08-22 10:48:44 +00:00
Tobias Thierer ff4ba02d5b Merge "Revert "Build support for 32-bit armv8-a"" am: 1da1c6d056
am: 0d35b9fba3

Change-Id: Id2ed78457ec3014812326ee34895bf705c741052
2017-08-22 10:42:35 +00:00
Tobias Thierer 0d35b9fba3 Merge "Revert "Build support for 32-bit armv8-a""
am: 1da1c6d056

Change-Id: I7a5ae22c984ffe8781998b5ae8e20aeb7516fac1
2017-08-22 10:36:35 +00:00
Tobias Thierer 1da1c6d056 Merge "Revert "Build support for 32-bit armv8-a"" 2017-08-22 10:30:29 +00:00