Commit Graph

3186 Commits

Author SHA1 Message Date
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
Tobias Thierer 7de79cbeaf Revert "Build support for 32-bit armv8-a"
This reverts commit 0daa78eef4.

Reason for revert: Broke the build for some targets (including marlin and angler).

$ make cts
build/core/combo/TARGET_linux-arm.mk:43: kryo is armv8-a.
build/core/combo/TARGET_linux-arm.mk:45: TARGET_2ND_ARCH_VARIANT, armv7-a-neon, ignored! Use armv8-a instead.
[...]
cts/tests/tests/os/jni/android_os_cts_CpuInstructions.cpp:88:20: error: instruction requires: armv7 or earlier
    asm volatile ( "swp r0, r0, [%0]" : "+r"(ptr) : : "r0" );
                   ^
<inline asm>:1:2: note: instantiated into assembly here
        swp r0, r0, [r1]
        ^

Change-Id: I65a91ed5a4461eca6646df13642a87a5c37d6c85
2017-08-21 15:03:16 +00:00
Bowgo Tsai 1f5e66c205 Merge "GSI: adds /odm mount point in root dir" into oc-mr1-dev
am: 76097d33b2

Change-Id: I9316c9cdacafb85920cb7a1ceff64c3cff27e37f
2017-08-21 01:43:23 +00:00
TreeHugger Robot 76097d33b2 Merge "GSI: adds /odm mount point in root dir" into oc-mr1-dev 2017-08-21 01:39:05 +00:00
Bowgo Tsai 2e2f6f2b75 Merge "64-bit GSI: adds init.zygote32_64.rc into root dir for vendor to select" into oc-mr1-dev
am: 35f997178a

Change-Id: I79f490a2ec637c5a60a8d019ab8e273a88a897b2
2017-08-20 05:21:39 +00:00
Isaac Chen d9609dd5f1 Merge "Build support for 32-bit armv8-a" am: 70fe80491c am: ef1e443e14 am: 43b2504cd2
am: e5dd3915f7

Change-Id: Ib9ddb35eee30e8024b92515873b904cd0e30d89a
2017-08-19 06:25:45 +00:00
Isaac Chen e5dd3915f7 Merge "Build support for 32-bit armv8-a" am: 70fe80491c am: ef1e443e14
am: 43b2504cd2

Change-Id: Ib2d66b827d2562dfc247fc97dc89baa960f735bf
2017-08-19 06:23:14 +00:00
Isaac Chen 43b2504cd2 Merge "Build support for 32-bit armv8-a" am: 70fe80491c
am: ef1e443e14

Change-Id: I4086a8e63dbda784686fd42fedd38dedbbac8771
2017-08-19 06:19:44 +00:00
Isaac Chen ef1e443e14 Merge "Build support for 32-bit armv8-a"
am: 70fe80491c

Change-Id: I6b4291a893ff42eca1933b8783e342855f22917f
2017-08-19 06:16:49 +00:00
Isaac Chen 70fe80491c Merge "Build support for 32-bit armv8-a" 2017-08-19 06:10:56 +00:00
Bowgo Tsai 882c99a33b GSI: adds /odm mount point in root dir
Bug: 64700195
Test: boot A/B device with /odm
Change-Id: Ie014a052a333b2cb8d89bc43e4326be81e638dcd
2017-08-18 16:18:35 +08:00
Bowgo Tsai cccd0b2a30 64-bit GSI: adds init.zygote32_64.rc into root dir for vendor to select
For 64-bit GSI, there are two different zygote settings:
  1. 64-bit primary, 32-bit secondary (init.zygote64_32.rc) OR
  2. 32-bit primary, 64-bit secondary (init.zygote32_64.rc)
  3. 64-bit only is currently forbidden (b/64280459#comment6)

This change adds the second setting into root dir for vendor.img to
select. The first setting already exists.

PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.zygote=zygote64_32 is removed
because the property will be put into vendor.img. i.e., it has no effect
on GSI.

Bug: 64280459
Test: build and boot device, checks init.zygote32_64.rc is in rootdir
Change-Id: I16b36018acac8cfeee7281d6f4b6c9c19467abec
2017-08-18 11:29:45 +08:00
SzuWei Lin 414d7c6ee2 Merge "Apply vndk_package to generic system image" into oc-mr1-dev
am: e6262be0d6

Change-Id: I0eecc4fe85dce729a8e9cc5d72066d4cb41f5543
2017-08-17 10:02:19 +00:00
SzuWei Lin 3cbe82df5f Apply vndk_package to generic system image
Add vndk_package into PRODUCT_PACKAGES, which includes
HAL interfaces, VNDK, VNDK-SP and LL-NDK.

vndk_package increases the total size of GSI content, so
changes the system partition size of:

* 64 bits projects to 1.5GB
* 32 bits projects to 1.0GB

Bug: 64654641
Test: build all GSI projects
Change-Id: I3c66c966eceebd63ee19f6a3de778beed0be6de5
2017-08-17 15:12:53 +08:00
SzuWei Lin df8310bfb6 Merge "Move common 32/64 bits product settings to another files" into oc-mr1-dev
am: 1f8b6033cb

Change-Id: Ie4b0c5055e4a221c2cc1c087ca25920b3026c47f
2017-08-15 17:20:30 +00:00
TreeHugger Robot 1f8b6033cb Merge "Move common 32/64 bits product settings to another files" into oc-mr1-dev 2017-08-15 16:53:08 +00:00
TreeHugger Robot d215d9038b Merge "Add com.android.location.provider to the system server classpath." into oc-mr1-dev 2017-08-15 10:10:24 +00:00
Nicolas Geoffray da7c0efec1 Merge "Add com.android.location.provider to the system server classpath." am: 24678e9469 am: 30f7a02a7a am: 1fe6892e19
am: db18b88c15

Change-Id: Icba118331fd26b92edaa373d2fd7a99e5eed0b09
2017-08-15 07:54:56 +00:00
Nicolas Geoffray db18b88c15 Merge "Add com.android.location.provider to the system server classpath." am: 24678e9469 am: 30f7a02a7a
am: 1fe6892e19

Change-Id: I6666568d1078d0d7dd9fb298dd9bf9c2911062d5
2017-08-15 07:50:55 +00:00
Nicolas Geoffray 1fe6892e19 Merge "Add com.android.location.provider to the system server classpath." am: 24678e9469
am: 30f7a02a7a

Change-Id: Ibdcba33ba9bd46f08e6c1e4410acea8bc68db61b
2017-08-15 07:44:55 +00:00
Nicolas Geoffray 30f7a02a7a Merge "Add com.android.location.provider to the system server classpath."
am: 24678e9469

Change-Id: I0ca70630d4a607feead6ab9c1feddc878e40f698
2017-08-15 07:40:39 +00:00
Nicolas Geoffray 963485ecf7 Add com.android.location.provider to the system server classpath.
bug: 64571709
Test: com.android.location.provider is speed compiled in /system

(cherry picked from commit ec5e04096b)

Change-Id: I179872125af89101bee7493f24687518cb39a0db
2017-08-15 08:33:09 +01:00
Nicolas Geoffray 24678e9469 Merge "Add com.android.location.provider to the system server classpath." 2017-08-15 07:32:10 +00:00
SzuWei Lin 2456b82419 Merge "Reduce the system partition size of generic system images" into oc-mr1-dev
am: b5b4829c45

Change-Id: Ie29f004b118bf2aa6f74b922b72ce3e65d364603
2017-08-15 01:02:00 +00:00
TreeHugger Robot b5b4829c45 Merge "Reduce the system partition size of generic system images" into oc-mr1-dev 2017-08-15 00:49:50 +00:00
Bo Hu 22221a4f5a Merge changes from topic "port-emu-to-oc-mr1-dev" into oc-mr1-dev
am: 60df0a831c

Change-Id: I6b3976e5f96324ffa9474cd84ff94f278a9dde33
2017-08-14 18:49:42 +00:00
bohu e81be42996 emulator: move rild.libpath to vendor
am: cb694ebb34

Change-Id: I77aea16d2e85e94d89354352a26a1695b736bb00
2017-08-14 18:49:28 +00:00
bohu ebc7dc21b8 sdk:enable emulator to launch in build environment
am: f2e71a4353

Change-Id: Id11fb442a1df7ae2e2f7eb5685101f6e5c9d6a2b
2017-08-14 18:49:08 +00:00
bohu 54416a0d53 build-emulator: fully treblize emulator image
am: d5f90a52e7

Change-Id: I547f67c8aed8b98116451838779453c4b0304124
2017-08-14 18:48:58 +00:00
Yahan Zhou 5a4f08b459 Build vendor image for emulator
am: c61b6bd2ed

Change-Id: Ieaa190c1bd9a356f39fa72ba5cd37570d6bba233
2017-08-14 18:48:45 +00:00
Bo Hu 60df0a831c Merge changes from topic "port-emu-to-oc-mr1-dev" into oc-mr1-dev
* changes:
  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-14 18:34:57 +00:00
Mathieu Chartier 92c48b9da3 Merge "Update paths for frameworks/base/config" into oc-mr1-dev
am: 3a1776a777

Change-Id: I98219d3e398c26be485887fa914060ed8f682ea2
2017-08-14 16:58:38 +00:00
Mathieu Chartier 3a1776a777 Merge "Update paths for frameworks/base/config" into oc-mr1-dev 2017-08-14 16:53:06 +00:00
SzuWei Lin 2999f29ea0 Move common 32/64 bits product settings to another files
Move the common 32/64 bits product settings from aosp_xxx.mk to

    target/product/treble_common_(32|64).mk

The original core_64_bit.mk is not match the GSI requirement,
and will be revised soon. So, clone the content of
core_64_bit.mk into treble_common_64.mk.

Bug: 64653300
Test: Build pass
Change-Id: I6154a5c4927287c703a874b5cbf6a7f0c2c3594c
2017-08-14 18:09:49 +08:00
bohu 753e9e4462 emulator: squash misc modifications from oc-emu-dev
Change-Id: I7380292cd4dc851a987683bdf61d511dbf74aff6
2017-08-13 22:32:01 -07:00
bohu cb694ebb34 emulator: move rild.libpath to vendor
BUG: 62137708
Test: buld sdk_gphone_x86-user, launch
emulator make sure radio works

Change-Id: I4ef1483a8d95a74b54deb6f0d4b2461c733c8140
2017-08-13 22:31:45 -07:00
bohu f2e71a4353 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
2017-08-13 22:31:36 -07:00
bohu d5f90a52e7 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
2017-08-13 22:31:22 -07:00
Yahan Zhou c61b6bd2ed 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
2017-08-13 22:28:58 -07:00
Bowgo Tsai 799f1cfcf3 Merge "treble_common.mk: add the vbmeta.img to disable verification" into oc-mr1-dev
am: 025d5d910b

Change-Id: Ib9680f060e7024d566f4b0c822a05ee19b8178df
2017-08-12 04:05:36 +00:00
TreeHugger Robot 025d5d910b Merge "treble_common.mk: add the vbmeta.img to disable verification" into oc-mr1-dev 2017-08-12 04:00:18 +00:00
Mathieu Chartier 37ba2d97df Update paths for frameworks/base/config
Bug: 64259751
Test: make
Change-Id: Ie159ef9f3f96d7ecd22429327a64161bd63f525b
2017-08-11 14:45:05 -07:00
Mathieu Chartier 4f3bce897b Merge "Add dirty-images-objects handling to boot image build." into oc-mr1-dev 2017-08-11 16:32:26 +00:00
Jiyong Park 4d19874e9c Merge "Phony module vndk_package is added" am: cb674cf05d am: 347310c363
am: c674a24562

Change-Id: Ie6da1725fdadce3ac1f64c4c4558e9bc0a5666d1
2017-08-11 02:26:21 +00:00
SzuWei Lin d52d6eb333 Merge "Move common settings in BoardConfig.mk into a common makefile" into oc-mr1-dev
am: 1f6869381f

Change-Id: I34be78f55f6b567c4c9d6760cddaaa72b2b8e81a
2017-08-11 02:26:06 +00:00
Jiyong Park c674a24562 Merge "Phony module vndk_package is added" am: cb674cf05d
am: 347310c363

Change-Id: I3915ef9a7600a91e890111b5718b783225e208f3
2017-08-11 02:22:12 +00:00
Jiyong Park 347310c363 Merge "Phony module vndk_package is added"
am: cb674cf05d

Change-Id: I9337748d3bcdb9489f0573214dbf3e9e9fe8cd9b
2017-08-11 02:17:42 +00:00
TreeHugger Robot 1f6869381f Merge "Move common settings in BoardConfig.mk into a common makefile" into oc-mr1-dev 2017-08-11 02:17:15 +00:00
Jeff Hao 4ae165c7ae Add dirty-images-objects handling to boot image build.
Allows grouping of classes with dirty static fields to be grouped
together in the image to have fewer dirty pages.

Bug: 62554875
Test: mm test-art-host

(cherry picked from commit 865d54caf2)

Change-Id: Id711ad1c2d98b12b0f55a29acca8a96834d69ede
2017-08-10 15:21:44 -07:00
Nicolas Geoffray ec5e04096b Add com.android.location.provider to the system server classpath.
bug: 64571709
Test: com.android.location.provider is speed compiled in /system
Change-Id: I64c5d5257cffb9bc8481bd4fb78a65cb08ac993a
2017-08-10 20:30:48 +01:00
Jiyong Park 69f4bca18e Merge "Phony module vndk_package is added" into oc-mr1-dev
am: 2f8aa9e774

Change-Id: I38ccd187eb64e204c629830df2553e86a006cf2a
2017-08-10 19:11:04 +00:00
TreeHugger Robot 2f8aa9e774 Merge "Phony module vndk_package is added" into oc-mr1-dev 2017-08-10 18:56:46 +00:00
SzuWei Lin cc1d9c35fc Reduce the system partition size of generic system images
Some device has small ROM size, so the GSI should be as small as
possible. The patch change the image sizes to be:

- 64 projects (default):    1.25GB (1280MB)
- 32 projects (default):    0.75GB  (768MB)
- ARM32 projects:                    734MB

Bug: 64458958
Test: Build all GSI projects
Change-Id: I7f7a266e48e99b0b4d5c6a84b8187b56e4482c94
2017-08-10 17:05:45 +08:00
Isaac Chen 0daa78eef4 Build support for 32-bit armv8-a
Overwrite TARGET_(2ND_)ARCH_VARIANT as armv8-a if
TARGET_(2ND_)CPU_VARIANT is set to some known armv8-a core like
cortex-a53, cortex-a73, kryo, denver64 etc.

For clang, -march is ignored if -mcpu is set to specific core so this
change doen't impact the objects built for armv7-a-neon/some_armv8_core
since it's treated as armv8-a/some_armv8_core.

Bug: 62895439
Test: Built modified aosp_arm64 with armv8-a as its TARGET_2ND_CPU_ARCH
      and generic as its TARGET_2ND_CPU_VARIANT successfully.
      "lunch hikey-userdebug; make" and verify TARGET_2ND_ARCH_VARIANT
      is overwritten.

Change-Id: If4260cf397783b5f56c4fd432615f4676429a1d3
2017-08-10 16:13:22 +08:00
SzuWei Lin 80755694f3 Move common settings in BoardConfig.mk into a common makefile
Bug: 63878637
Test: Build pass and boot into home screen with aosp_arm64_ab of GSI
Change-Id: I1b843fcccd83e2e30eba66451b10f093ccfd458f
2017-08-10 15:03:21 +08:00
SzuWei Lin 9c941ce331 Merge "Force generic system image to load dex pre-opt from system" into oc-mr1-dev
am: 1b2b437204

Change-Id: I2c5b311e1b56b923f7fcdd086d28dee97acc0d2d
2017-08-10 05:43:18 +00:00
TreeHugger Robot 1b2b437204 Merge "Force generic system image to load dex pre-opt from system" into oc-mr1-dev 2017-08-10 05:31:44 +00:00
Jiyong Park a5535733f1 Phony module vndk_package is added
This phony module aggregates all the VNDK-related libraries so that they
can be installed to the system partition simply by adding 'vndk_package'
to PRODUCT_PACKAGES. This is to sneure that all VNDK libraries are
installed even when there is no vendor library using some of the VNDK
libs (especially when building system image only).

Bug: 64013660
Test: BOARD_VNDK_VERSION=current m -j vndk_package
Merged-In: I3a14a7eaaffd6a7f3258a4be59b1c5813153714d
Change-Id: I3a14a7eaaffd6a7f3258a4be59b1c5813153714d
2017-08-10 14:15:01 +09:00
SzuWei Lin 2a2a7a77ba Merge "Add new products aosp_x86_ab and aosp_x86_64_ab" into oc-mr1-dev
am: 76a097786c

Change-Id: I3e5db03c6eb50b7e4cd22c0ee17a6b4ff75a7e0c
2017-08-10 05:13:17 +00:00
Jiyong Park 6ea81532ea Phony module vndk_package is added
This phony module aggregates all the VNDK-related libraries so that they
can be installed to the system partition simply by adding 'vndk_package'
to PRODUCT_PACKAGES. This is to sneure that all VNDK libraries are
installed even when there is no vendor library using some of the VNDK
libs (especially when building system image only).

Bug: 64013660
Test: BOARD_VNDK_VERSION=current m -j vndk_package
Change-Id: I3a14a7eaaffd6a7f3258a4be59b1c5813153714d
2017-08-10 14:11:41 +09:00
TreeHugger Robot 76a097786c Merge "Add new products aosp_x86_ab and aosp_x86_64_ab" into oc-mr1-dev 2017-08-10 05:07:37 +00:00
SzuWei Lin 78a11ff550 Merge changes I9f956bc3,Ifad208d2,Ifb3e0235 into oc-mr1-dev
am: 0ef22fd4ae

Change-Id: Ib76d012c836970afa9157400e31f1e79dc71ed30
2017-08-10 04:52:44 +00:00
TreeHugger Robot 0ef22fd4ae Merge changes I9f956bc3,Ifad208d2,Ifb3e0235 into oc-mr1-dev
* changes:
  Add new products aosp_x86_a and aosp_x86_64_a
  Add new product aosp_arm_ab
  Share system properties with all GSI project with treble_system.prop
2017-08-10 04:46:30 +00:00
Roozbeh Pournader 3c410faa74 Enable Canadian English on L10n builds
am: e3793d947f

Change-Id: I00ab6906994456da3876db11b3232f0bda206a37
2017-08-09 22:05:07 +00:00
Roozbeh Pournader e3793d947f Enable Canadian English on L10n builds
Bug: 64491256
Test: mmma -j packages/apps/Settings (and checking the APK using aapt dump badging)
Change-Id: I1108802a89bd82ccc6e2cc0c2464b8e30eb796b4
2017-08-09 12:08:22 -07:00
Roozbeh Pournader f404c80369 Add en-XC (cracked pseudo-locale) to L10n build
am: c11e0eac1c

Change-Id: Ic61253e7a0258e120f483cac9fd25f6e3a4e361e
2017-08-09 18:41:32 +00:00
Mark Salyzyn 6157cf697a Merge "logcat: permit transition to Android.bp" am: 374f753211 am: 1830c9596d am: 5d9e6eb512
am: 2888bd2385

Change-Id: I559ff3733eacced71fedf5b4088dab32433dbc21
2017-08-09 00:09:03 +00:00
Roozbeh Pournader c11e0eac1c Add en-XC (cracked pseudo-locale) to L10n build
Also sort the locales alphabetically (keeping en-US first) and move
them to separate lines.

Bug: 64394698
Test: none
Change-Id: I3aad3ce1ad9093ffe0ffdf56ebb6f287aec29d44
2017-08-09 00:05:13 +00:00
Mark Salyzyn 2888bd2385 Merge "logcat: permit transition to Android.bp" am: 374f753211 am: 1830c9596d
am: 5d9e6eb512

Change-Id: I9ec6334643253c7fb07916dcaab48c82a6112d77
2017-08-08 23:31:50 +00:00
Mark Salyzyn 5d9e6eb512 Merge "logcat: permit transition to Android.bp" am: 374f753211
am: 1830c9596d

Change-Id: I0fbe9bf8f12c10ce30fddc2e1a3ed9c66b21c6ce
2017-08-08 23:16:27 +00:00
Mark Salyzyn 1830c9596d Merge "logcat: permit transition to Android.bp"
am: 374f753211

Change-Id: Ieeee905248faea638ed18831ba2168f2914f7d02
2017-08-08 23:10:03 +00:00
Treehugger Robot 374f753211 Merge "logcat: permit transition to Android.bp" 2017-08-08 23:06:25 +00:00
Mark Salyzyn 719790f4d4 logcat: permit transition to Android.bp
Permit transition of logcat to Android.bp by moving the debug
target logpersist.start to the PRODUCT_PACKAGES_DEBUG list.

Test: compile
Change-Id: I6cfd4c40f848a2ff2661e3692fa8cd69ed99e8c9
2017-08-08 14:24:55 -07:00
Todd Poynor e2cf08e6e9 Merge "thermal: Add Thermal HAL 1.1 to treble_common.mk" into oc-mr1-dev
am: f2a63c19f3

Change-Id: I00868fe13192e7a511367e83f7280464589890ed
2017-08-08 01:22:21 +00:00
Todd Poynor 8302bc0c12 thermalserviced: add ThermalService daemon
am: 614482f09f

Change-Id: I5a40f99c49b261ba6202e74fac222f41ebd953ff
2017-08-08 01:22:14 +00:00
TreeHugger Robot f2a63c19f3 Merge "thermal: Add Thermal HAL 1.1 to treble_common.mk" into oc-mr1-dev 2017-08-08 01:15:36 +00:00
Jeff Gaston 3fbd26c2b8 Merge "Remove the need to find Android.mk files via directory symlinks" am: 6ab53d7211 am: 03e7e81837 am: aed14c5515
am: 5b767956fd

Change-Id: Ib65d41975941cced51e5e5e37b7b3d87e93b4367
2017-08-08 00:22:22 +00:00
Jeff Gaston 5b767956fd Merge "Remove the need to find Android.mk files via directory symlinks" am: 6ab53d7211 am: 03e7e81837
am: aed14c5515

Change-Id: I84c8258ebb89eff647cdd52663f812c5600145e1
2017-08-08 00:19:21 +00:00
Jeff Gaston aed14c5515 Merge "Remove the need to find Android.mk files via directory symlinks" am: 6ab53d7211
am: 03e7e81837

Change-Id: Ib453be719ce27c3f354b1353e45939cee2102aea
2017-08-08 00:16:53 +00:00
Jeff Gaston 03e7e81837 Merge "Remove the need to find Android.mk files via directory symlinks"
am: 6ab53d7211

Change-Id: I0495d45001821d095531d5be7c049fc2836888f7
2017-08-08 00:14:51 +00:00
Jeff Gaston 6ab53d7211 Merge "Remove the need to find Android.mk files via directory symlinks" 2017-08-08 00:05:09 +00:00
Todd Poynor 614482f09f thermalserviced: add ThermalService daemon
Add ThermalService daemon to embedded.mk as part of the minimal build
of open source parts of the tree.

Test: manual on marlin
Bug: 30982366
Change-Id: I8315a8f5871ec24d8970deaa8527ee74db1c4dc7
(cherry picked from commit d006688090)
2017-08-07 23:02:56 +00:00
Todd Poynor 6197aba946 thermal: Add Thermal HAL 1.1 to treble_common.mk
Add rev 1.1 of Thermal HAL.

Test: VtsHalThermalV1_1TargetTest; plus manual on marlin
Bug: 30982366
Change-Id: Iaaef326e5d2bad05d934614b79c7c44e7592fdc4
(cherry picked from commit ca0adce235)
2017-08-07 23:02:01 +00:00
Jeff Gaston 5c1f3fd068 Remove the need to find Android.mk files via directory symlinks
Bug: 64397960
Test: m -j
Change-Id: I5b77dd654dfced63900913c447b5448b632158d7
2017-08-07 14:21:20 -07:00
Jeff Hao d405e38d62 Merge "Add dirty-images-objects handling to boot image build." am: 5848fedea8 am: 3b16c4e7c7 am: 5b3e24484c
am: 7e6899ac53

Change-Id: I1db95c6b937d4ef0c930739407e799383781b068
2017-08-05 01:30:20 +00:00
Jeff Hao 7e6899ac53 Merge "Add dirty-images-objects handling to boot image build." am: 5848fedea8 am: 3b16c4e7c7
am: 5b3e24484c

Change-Id: I18365f7c17ccb0b2e90dd4ecfbddaeb5843bcfde
2017-08-05 01:20:34 +00:00
Jeff Hao 5b3e24484c Merge "Add dirty-images-objects handling to boot image build." am: 5848fedea8
am: 3b16c4e7c7

Change-Id: I2786f4baa79a9842d91426a721cee80b1f039900
2017-08-05 01:13:40 +00:00
Jeff Hao 3b16c4e7c7 Merge "Add dirty-images-objects handling to boot image build."
am: 5848fedea8

Change-Id: Ida5683c28ed78db625a5383f52b81a087373ea75
2017-08-05 01:02:18 +00:00