Commit graph

2840 commits

Author SHA1 Message Date
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
76097d33b2 Merge "GSI: adds /odm mount point in root dir" into oc-mr1-dev 2017-08-21 01:39:05 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
SzuWei Lin
8b60c822ab Force generic system image to load dex pre-opt from system
Generic system image always generates dex pre-opt in system image,
to improve the time of first boot.

But the property ro.cp_system_other_odex could be defined in vendor
image, so we disable the property in generic system image to force
dex pre-opt be loaded from system image.

Bug: 62645784
Test: Test the patch on a A/B project with GSI, confirm the dex
      pre-opt is loaded from GSI.

Change-Id: I71b4a5bed517841b5f889d21d73429fa91da25ba
Merged-In: I71b4a5bed517841b5f889d21d73429fa91da25ba

(cherry picked from commit 5677b877fb)
2017-08-04 11:47:02 +08:00
Bowgo Tsai
9afc0d5349 treble_common.mk: add the vbmeta.img to disable verification
AVB should be disabled for Treble VTS. Otherwise, OEM devices cannot boot
the generic system.img provided by Google.

Bug: 64055917
Test: Compiles and boot a device with the vbmeta.img
Change-Id: I0eaae7beebc8b901d0b4766c2cdc34a27ad02b59
2017-08-02 21:15:26 +08:00
Bo Hu
bc88ff69cf Revert "Revert "emulator: create qemu images for system,vendor""
This reverts commit 9b99ddc8a5.
and add syste-qemu.img to the dependency list of sdk target

BUG: 64235252

Test: build sdk target successfully

(cherry picked from commit f0d50bbef0)

Change-Id: I813233c7c3f06eb1eca18aad5ea890a55814eb1b
2017-08-01 14:34:15 -07:00
Niranjan Pendharkar
593767a780 update new HIDL interfaces in generic system image
am: 4584215b55

Change-Id: I644f7e1a1d4ceabbccecfb54914cc723021bac3b
2017-07-31 18:56:11 +00:00
TreeHugger Robot
d4083602cc Merge "Adds the Neural Networks lib to the base configuration." into oc-mr1-dev 2017-07-29 23:55:40 +00:00
Niranjan Pendharkar
4584215b55 update new HIDL interfaces in generic system image
Test: Boot to home screen
Bug: 36682246
Change-Id: Ia856ed0929caa0c089a62100d17f717519ae5ebf
2017-07-28 08:30:03 -07:00
SzuWei Lin
0f0cc8a17f Add new products aosp_x86_ab and aosp_x86_64_ab
The product is for GSI with x86 64-bits and 32-bits with A/B
update.

Bug: 38339398
Test: Build pass
Change-Id: I1f945a812e0fbf8c4266d2f91624c2c674941383
Merged-In: I1f945a812e0fbf8c4266d2f91624c2c674941383
(cherry picked from commit 06956fe54c)
2017-07-28 11:40:25 +08:00
SzuWei Lin
e4648214e8 Add new products aosp_x86_a and aosp_x86_64_a
The product is for GSI with x86 64-bits and 32-bits without A/B
update.

Bug: 38339837
Test: Build pass and boot to home screen on 32/64-bits x86 emulator
      by replacing system image with GSI
Change-Id: I9f956bc35ba5700900df7c2fca45bf794684a418
Merged-In: I9f956bc35ba5700900df7c2fca45bf794684a418
(cherry picked from commit 4b189c810e)
2017-07-28 11:39:56 +08:00
SzuWei Lin
e572132aa6 Add new product aosp_arm_ab
The product is for GSI with ARM 32-bits and A/B update.

Bug: 38339485
Test: Build pass
Change-Id: Ifad208d2e625f30d0a3dd964d53d81257eeefabf
Merged-In: Ifad208d2e625f30d0a3dd964d53d81257eeefabf
(cherry picked from commit fbc4835faa)
2017-07-28 11:39:40 +08:00
SzuWei Lin
9821e00caa Share system properties with all GSI project with treble_system.prop
Use TARGET_SYSTEM_PROP to assign a common system property file in each
GSI BoardConfig.mk

Bug: 62647757
Test: make and check the file system/build.prop in out folder
Change-Id: Ifb3e02356869f97573a3690a6d67c2b4a9471c46
Merged-In: Ifb3e02356869f97573a3690a6d67c2b4a9471c46
(cherry picked from commit 7e10169909)
2017-07-28 11:38:59 +08:00
Lucas Dupin
203de1108f Merge "Removed overlay from target" into oc-dr1-dev
am: eb42aa7438

Change-Id: If2720dcb6e3c376f968e454fb734f3443c5a3080
2017-07-25 23:23:03 +00:00
Lucas Dupin
3297613a43 Removed overlay from target
Lock screen colors won't be handled by overlays anymore.

Test: make
Bug: 63751714
Change-Id: I496575d62ab326e7bb774643fac6fcb8d6c801a1
2017-07-24 13:29:26 -07:00
Jorim Jaggi
2145739ff4 Merge "Revert "Removed overlay from target"" into oc-dr1-dev
am: 8a7f2128b3

Change-Id: If4242cbe667e689662ba2323e986d35cf6c03f53
2017-07-24 14:13:41 +00:00
Jorim Jaggi
8a7f2128b3 Merge "Revert "Removed overlay from target"" into oc-dr1-dev 2017-07-24 14:07:55 +00:00
Jorim Jaggi
fa794173fe Revert "Removed overlay from target"
This reverts commit fd2b1807ca.

Fixes crashloop with lock pattern

Change-Id: I6f15c18e7a10d6755ab151bb976616e753e520a3
Fixes: 63980375
2017-07-24 13:55:19 +00:00