Commit graph

38855 commits

Author SHA1 Message Date
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
Narayan Kamath
fd6cbbe609 Merge "apkcerts: Add information about the compressed state of the APK." into oc-mr1-dev 2017-08-15 08:28:25 +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
bohu
a508578811 sdk: add vendor-qem.img into the deps list
if it exists. Fix master-without-vendor sdk_x86-sdk build

Change-Id: I5656e7124d30e71120044cce668c54793f77208a
2017-08-14 14:52:20 -07: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
Narayan Kamath
6a4bd696f6 apkcerts: Add information about the compressed state of the APK.
We add a compressed="$extension" attribute to an APK's entry if it's
compressed.

Bug: 64531948
Test: make dist

Change-Id: Ic3f95ed77f0bb16dec825bae944c70ee2d130657
2017-08-14 14:50:28 +01: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
e5e0742444 emualtor: keep libopenjdkjvmti*.so on sdk images
BUG: 38353037

Those libopenjdkjvmti*.so files are needed by profilers.
Those files are shipped on real devices as well.

Change-Id: Iac7dd2844b0f3ea5194dec8732fbaacf53c4bf4a
2017-08-13 22:31:53 -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
Narayan Kamath
2f6b55266a Merge "Implement LOCAL_COMPRESSED_MODULE." into oc-mr1-dev 2017-08-11 09:30:33 +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
David Sehr
35816c2130 Merge "DO NOT MERGE ANYWHERE Revert "Build: More tombstones in userdebug"" into oc-dr1-dev
am: f1ad51082c  -s ours

Change-Id: Ia5fade4a2cd1dc65373ca8646e97bc4ee2c8ec3a
2017-08-10 23:18:50 +00:00
TreeHugger Robot
f1ad51082c Merge "DO NOT MERGE ANYWHERE Revert "Build: More tombstones in userdebug"" into oc-dr1-dev 2017-08-10 23:10:54 +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
Ian Pedowitz
97b8620c72 v8.0.0 was only temporary. O-DR is 8.0.0
am: 47f1b93dfa  -s ours

Change-Id: If3cf4e153911ddec1a46176bf78b6831e6ca8803
2017-08-10 20:42:35 +00:00
TreeHugger Robot
2f8aa9e774 Merge "Phony module vndk_package is added" into oc-mr1-dev 2017-08-10 18:56:46 +00:00
David Sehr
bc961b198b DO NOT MERGE ANYWHERE Revert "Build: More tombstones in userdebug"
This reverts commit 47e137f357.

Bug: 64290162
Test: presubmit
Change-Id: I7ca8918d817a8e7b4aece1ded38d08d10ff01b61
2017-08-10 16:14:05 +00:00
Narayan Kamath
7c205107ce Implement LOCAL_COMPRESSED_MODULE.
- Prebuilts with LOCAL_MODULE_CLASS == APPS and BUILD_PACKAGE that
  define LOCAL_COMPRESSED_MODULE := true will be installed compressed
  in the system partition.
- The compression algorithm is simple gzip for now.

In addition :
- Compressed modules are not dex-preopted.
- JNI shared libraries are always embedded inside compressed modules,
  they are never installed as separate files on the FS.

Test: Manual
Bug: 63802184

Change-Id: Id12b1ff0b1d68791ec1178783f7e78910e122a33
2017-08-10 12:38:11 +01: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
TreeHugger Robot
a32a8c0b43 Merge "build: aux: Fix link type checking for AUX builds" into oc-mr1-dev 2017-08-09 23:57:36 +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
Ian Pedowitz
47f1b93dfa v8.0.0 was only temporary. O-DR is 8.0.0
Fixes: 64130669
Fixes: 64125438
Fixes: 64437834
Test: Flashed oc-dr1-dev ToT and ensured device booted
Test: Rebuilt with topic:ODR-8.0.0 and reflashed without wipe
Test: device booted
Merged-In: I7894321971c0b696594deb064ebed3f43cf7c8d1
Change-Id: I1316358d0121b82902ac708088a49d480f3a6ad4
2017-08-09 12:06:37 -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
Calin Juravle
013be8766f Merge "Replace -classpath with --class-loader-context for preopt" into oc-mr1-dev 2017-08-07 21:32:58 +00:00
Alexey Polyudov
19e0320ccb build: aux: Fix link type checking for AUX builds
AUX build environent is volatile and is only instantiated in
a context of AUX-aware module.
link-type checking is happening outside such context, and
is not able to correctly determine AUX build dependencies.

1. Save enough of context in LINK_TYPE variable;
   Use AUX-<variant-name> instead of AUX
2. Load correct set of AUX meta build vars before
   building link_type rules

Bug: 62060489
Test: make auxiliary

build no longer tries to access "/STATIC_LIBRARIES" path

Change-Id: I9764d4a0740da1c55a6f8429398872fc4362942c
(cherry picked from commit 55ebe631b4)
2017-08-04 12:45:02 -07:00
TreeHugger Robot
9a50c8507a Merge "Making a comment a bit more explicit" into oc-mr1-dev 2017-08-04 16:52:11 +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
Bart Sears
6cfcffff1e Merge "Change Android version to v8.0.0" into oc-dr1-dev
am: 1e91b2229b  -s ours

Change-Id: I36e3917bd472b395fe6740df1185a1b13cf72395
2017-08-04 02:56:32 +00:00
Bart Sears
1e91b2229b Merge "Change Android version to v8.0.0" into oc-dr1-dev 2017-08-04 02:50:52 +00:00
Ian Pedowitz
f28bf722c2 Making a comment a bit more explicit
Bug: 64364822
Test: N/A comment only
Change-Id: I4ef65aef4521326ac48539ad27422f881cc3e883
2017-08-03 17:38:26 -07:00
Bart Sears
a302746d9b Change Android version to v8.0.0
Change PLATFORM_VERSION.OPD1 to v8.0.0.  This is a temporary
change until we get a new KeyMaster that can handle going from
8.0.1 -> 8.0.0.  At that point we will change PLATFORM_VERSION
to 8.0.0.

Test: Check: Settings > System > About phone > Android version.
Also verified that update from 8.0.1 to v8.0.0 works (i.e. device
boots and shows new Android Version).
Bug: 64130669
Merged-In: I7894321971c0b696594deb064ebed3f43cf7c8d1
Change-Id: Ibb8fbb123a74196f57f649d0c22f58beefaf6d06
2017-08-03 16:23:59 -07:00