Commit graph

38924 commits

Author SHA1 Message Date
Adam Seaton
dafd187ab5 [Do Not Merge] Update platform security string to 2017-10-01 in KLP dev Bug:64896113
am: f2f5343ba1

Change-Id: I8d79367624f8e1f8fe0e52374521b55f49e9ec83
2017-08-22 17:06:25 +00:00
Adam Seaton
4e140ce86a Update platform security string to 2017-10-05 in oc-dev Bug:64896113 2017-08-21 11:37:32 -07:00
Adam Seaton
80d3742026 Update platform security string to 2017-10-01 in oc-dev Bug:64896113 2017-08-21 11:36:54 -07:00
Adam Seaton
1517f3d2da [DO NOT MERGE] Update platform security string to 2017-10-05 in nyc-dev Bug:64896113 2017-08-21 11:26:49 -07:00
Adam Seaton
73ab80dec9 [DO NOT MERGE] Update platform security string to 2017-10-01 in nyc-dev Bug:64896113 2017-08-21 11:26:14 -07:00
Adam Seaton
cf83f5a4f3 [DO NOT MERGE] Update platform security string to 2017-10-01 in lmp-dev Bug:64896113 2017-08-21 11:08:37 -07:00
Adam Seaton
f2f5343ba1 [Do Not Merge] Update platform security string to 2017-10-01 in KLP dev
Bug:64896113
2017-08-21 10:52:18 -07:00
Narayan Kamath
a07bf049b9 releasetools: Add support for compressed APKs.
Compressed APKs can be identified by a "compressed=<ext>" entry in
the apkcerts.txt file. When we encounter such an entry, we need to
decompress the file to a temporary location before we process its
certs. When we're signing, we should also recompress the package
after it's signed.

Bug: 64531948
Test: ./build/tools/releasetools/check_target_files_signatures.py
Test: ./build/tools/releasetools/sign_target_files_apks.py
Test: compared signed output before / after this change, verify that
      it's bitwise identical when no compressed APKs are present.

Change-Id: Id32e52f9c11023955330c113117daaf6b73bd8c2
2017-08-21 13:21:20 +01: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
TreeHugger Robot
35f997178a Merge "64-bit GSI: adds init.zygote32_64.rc into root dir for vendor to select" into oc-mr1-dev 2017-08-20 05:14:04 +00:00
TreeHugger Robot
ee67a45175 Merge "cxx_stl_setup is not executed for modules from soong" into oc-mr1-dev 2017-08-18 18:31:14 +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
Jiyong Park
82962a982c cxx_stl_setup is not executed for modules from soong
cxx_stl_setup is adding libunwind_llvm to the dependency even for
modules from soong. However, since this dependency was already handled
in soong, those modules don't need to go through it again.

Bug: 64815735
Test: BOARD_VNDK_VERSION=current mma -j (under /hardware/libhardware)

Merged-Id: Id6e2547c752ec831aa56a14c0bf4db0a55d51243
Change-Id: Id6e2547c752ec831aa56a14c0bf4db0a55d51243
(cherry picked from commit 425d489cb9)
2017-08-18 14:16:11 +09:00
TreeHugger Robot
b726558507 Merge "Copy adbd from system/bin to recovery/root/sbin" into oc-mr1-dev 2017-08-18 03:52:36 +00: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
TreeHugger Robot
e6262be0d6 Merge "Apply vndk_package to generic system image" into oc-mr1-dev 2017-08-17 09:59:39 +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
TreeHugger Robot
f01a5ef7c3 Merge "oc-mr1-dev is now 8.1.0" into oc-mr1-dev 2017-08-16 20:39:27 +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
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
Bowgo Tsai
3147e7cfab Copy adbd from system/bin to recovery/root/sbin
This change will be submitted with other changes moving adbd from
root/sbin to system/bin. We need to copy it specifically to recovery root.
Previously it was copied by rsync $(TARGET_ROOT_OUT) $(TARGET_RECOVERY_OUT).

Bug: 63910933
Test: normal boot sailfish, checks adb works
Test: recovery boot sailfish, checks adb works
Test: normal boot bullhead, checks adb works
Test: recovery boot bullhead, checks adb works

Change-Id: Ib49605f97a190aec2648cb000d1159b6e15db673
2017-08-15 11:33:17 +08: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