Commit Graph

56109 Commits

Author SHA1 Message Date
Mike Ma e8e3b5f0ba Merge "Removing IVrComposerClient 1.0 from vndk." 2019-09-20 14:23:00 +00:00
Yo Chiang fd59e543e8 Move ro.com.android.dataroaming sysprop to aosp_product.mk
aosp_${device}.mk all have this system property set inside
vendor/build.prop:
  ro.com.android.dataroaming=true

so move this common setting into aosp_product.mk

We don't move this to //device/google/${device}/device-${device}.mk
because this property is only used by AOSP builds, so it may cause
issues if we make it a common setting across all device builds.

Bug: 136525499
Bug: 135502030
Test: Compare $ANDROID_PRODUCT_OUT before and after this change
Change-Id: Idd9e235707d9a7fea28fa8c741ad1a4014f71c86
2019-09-20 12:04:03 +00:00
SzuWei Lin 1b4eaef865 Phase out Legacy GSI and gsi_common.mk
The Legacy GSI is used on O/O-MR1 devices.
Do not need to support anymore. Phase out it.

Bug: 135977699
Test: none
Change-Id: I48b563a3aceca3c926e744165eb1dd88eff7a3d2
Merged-In: I48b563a3aceca3c926e744165eb1dd88eff7a3d2
2019-09-20 10:48:12 +08:00
Tao Bao 448004af9d Don't generate hashtree when signing bundled APEXes.
Bug: 139957269
Test: Sign a target_files.zip. Extract a re-signed APEX and check the
      hashtree size (being zero).
Test: Use sign_apex to sign an APEX file. Check the hashtree size (not
      being zero).
Test: python -m unittest test_apex_utils
Test: python -m unittest test_sign_apex
Change-Id: I927b7681d66920d7732b700ec3a8f7a65b4cb351
2019-09-19 14:41:34 -07:00
Dan Shi 796ff4ffb5 Create a vts-core suite harness package
vts-core.zip will include all vts-core tests and suite harness
(vts-core-tradefed).

Bug: 141012181
Test: m -j vts-core

Change-Id: Ib13a2bffb4dc9619d2732d65729ecb0246a0b9a0
2019-09-19 13:13:44 -07:00
Lubo Hristov 89b18c02ae Update SPL to 2019-11-01
bug:141272605
2019-09-19 19:54:07 +00:00
mamik 5980f173c4 Removing IVrComposerClient 1.0 from vndk.
Bug: 141255490
Test: Manual, test build on master.
Change-Id: I9b65203e0d067855db03bda4e1b08333c59a0b4d
2019-09-19 18:10:05 +00:00
Przemyslaw Szczepaniak 6cbaf66026 Remove android.hardware.neuralnetworks@1.X dependencies.
After moving NNAPI to an APEX, android.hardware.neuralnetworks@1.X
were added as explicit dependencies to enable NNAPI static tests
to run.

It's possible to make them included in NNAPI static tests as static
libraries, no point in keeping them here.

Bug: 139120468
Test: flashed crosshatch, NNAPI static tests
Change-Id: Ib7fb001cb76c9f36dc651f268c9acb7c7bb43a43
2019-09-19 17:43:06 +01:00
Mitch Phillips 7e7e685e22 Merge "Add backend for LOCAL_FUZZ_DATA for cc_fuzz corpus/dict." am: 30e613a48d
am: c9a79eb8e8

Change-Id: I2035b07c041ab2209b7bd95229400ce3e5a85347
2019-09-19 07:15:44 -07:00
Mitch Phillips c9a79eb8e8 Merge "Add backend for LOCAL_FUZZ_DATA for cc_fuzz corpus/dict."
am: 30e613a48d

Change-Id: I3606b86577ba2c498cae44f51c1e89076c5fc8d0
2019-09-19 07:08:42 -07:00
Treehugger Robot 30e613a48d Merge "Add backend for LOCAL_FUZZ_DATA for cc_fuzz corpus/dict." 2019-09-19 13:51:17 +00:00
Mitch Phillips fd6d9022fe Add backend for LOCAL_FUZZ_DATA for cc_fuzz corpus/dict.
Adds the backend makefile parser for the LOCAL_FUZZ_DATA vars generated
by the cc_fuzz target.

Bug: 141026328
Test: m example_fuzzer, fuzz target should have adjacent corpus/dict
files.

Change-Id: Ide2c34318f11be132992650ce5cc1fd27895915c
2019-09-18 18:58:28 -07:00
Daniel Norman 50ecbd5b8e Merge "Creates img.zip from target files zip, not dir." am: c4f6f36dc4
am: 28dfca32ca

Change-Id: I60042a4e02bb395eec17e6f00c5ca2b22bdf51eb
2019-09-18 18:39:58 -07:00
Daniel Norman 28dfca32ca Merge "Creates img.zip from target files zip, not dir."
am: c4f6f36dc4

Change-Id: Id256ea664fcdb2eb5a80d170879a0d27297ddaa2
2019-09-18 18:33:34 -07:00
Daniel Mentz f846914c9f Don't package mke2fs.conf in otatools.zip
mke2fs.conf is now packaged into the Python executable mkuserimg_mke2fs
and no longer needs to be packaged directly into otatools.zip.

Change-Id: I06216ccd60f834747f9302e30397a7f0bae53726
2019-09-18 18:24:41 -07:00
Treehugger Robot c4f6f36dc4 Merge "Creates img.zip from target files zip, not dir." 2019-09-19 01:03:33 +00:00
Colin Cross 05549c3d09 Merge "Remove TARGET_TRANSLATE_2ND_ARCH" am: bd496d27ad
am: 7fb589b429

Change-Id: Ieb4c0a0f38487c8af28623e2205741c356817720
2019-09-18 14:05:54 -07:00
Daniel Norman 74eb74b146 Creates img.zip from target files zip, not dir.
Directory support for img_from_target_files was dropped in aosp/1095755.

Test: Create & boot a merged build.
Change-Id: Ib976ea60a24c2f172c597130d6bcce25199a93b3
2019-09-18 14:03:34 -07:00
Colin Cross 7fb589b429 Merge "Remove TARGET_TRANSLATE_2ND_ARCH"
am: bd496d27ad

Change-Id: Ie60e012f488c5f5447c095be07081fd809335de7
2019-09-18 13:59:43 -07:00
Treehugger Robot bd496d27ad Merge "Remove TARGET_TRANSLATE_2ND_ARCH" 2019-09-18 20:47:43 +00:00
Tao Bao 3bbd124324 Merge "releasetools: Remove more images out of secondary payload." am: baa7ca0eca
am: 48f797e55c

Change-Id: I02ca132a20acf574e435e4ca0e7a1cc733770c84
2019-09-18 11:01:03 -07:00
Tao Bao 48f797e55c Merge "releasetools: Remove more images out of secondary payload."
am: baa7ca0eca

Change-Id: Ibac4d518d96653f3ca6b6dbbc355c398c70ae491
2019-09-18 10:55:01 -07:00
Tao Bao baa7ca0eca Merge "releasetools: Remove more images out of secondary payload." 2019-09-18 17:37:14 +00:00
Colin Cross 02b50d12be Remove TARGET_TRANSLATE_2ND_ARCH
TARGET_TRANSLATE_2ND_ARCH is never set to true any more,
TARGET_NATIVE_BRIDGE_ARCH := arm is always used instead.

Bug: 141242600
Test: m checkbuild
Change-Id: Id3e0614a1d8a088d37929655b74fecd812606db2
2019-09-18 16:23:04 +00:00
Tao Bao 3e759462d9 releasetools: Remove more images out of secondary payload.
This CL additionally removes boot/dtbo/modem/vbmeta_* images out of
secondary payload. We essentially only keep system_other.img and
bootloader images there.

For Pixel devices, this additionally saves ~80MiB (mostly because of
the removal of boot and radio images).

Bug: 140771390
Test: ota_from_target_files \
          --include_secondary --skip_postinstall \
          -i input-target_files-1.zip \
          input-target_files-2.zip \
          output-ota.zip
Test: python -m unittest test_ota_from_target_files
Change-Id: If47b27c52b3547a4cc86223a988c53960bc6af40
2019-09-17 22:56:19 -07:00
SzuWei Lin a9ef5327b3 Merge "Revise aosp_x86_arm to inherit from mainline_system directly" am: 7be2b01f3c
am: 22096814e3

Change-Id: I5761471c556cb41faa8c39ab3c76eab6853151fe
2019-09-17 21:59:38 -07:00
SzuWei Lin 22096814e3 Merge "Revise aosp_x86_arm to inherit from mainline_system directly"
am: 7be2b01f3c

Change-Id: I21626f8bfe8705a4486edf19ff3494dbbbf6db83
2019-09-17 21:53:02 -07:00
Treehugger Robot 7be2b01f3c Merge "Revise aosp_x86_arm to inherit from mainline_system directly" 2019-09-18 04:41:30 +00:00
Harpreet \"Eli\" Sangha 91ca2da51d Merge "Add CLI for Directly Invoking IDL APIs" am: ccbdb22fd4
am: 564e016e30

Change-Id: I0337a08d44cc0cfdfae87c2020141783872ceed1
2019-09-17 21:12:36 -07:00
Harpreet \"Eli\" Sangha 564e016e30 Merge "Add CLI for Directly Invoking IDL APIs"
am: ccbdb22fd4

Change-Id: I3466221032014a2903de7c4a6f241aae886ff5aa
2019-09-17 21:07:03 -07:00
Treehugger Robot ccbdb22fd4 Merge "Add CLI for Directly Invoking IDL APIs" 2019-09-18 03:43:29 +00:00
SzuWei Lin 18ef515e58 Revise aosp_x86_arm to inherit from mainline_system directly
After applying the patch, the contents in system/product align
to the mainline_system/aosp_product.

aosp_x86_arm is not releaseded for GSI. The patch also inherits
from BoardConfigMainlineCommon.mk instead of
BoardConfigGsiCommon.mk. But keeps output system_ext and product
files to /system/system_ext/ and /system/product/.

Bug: 136616665
Test: Compare the product out folder with/without the patch
Change-Id: I2aefbd2d3e71e26219508e53161fa8a3cc2fd652
2019-09-18 02:11:39 +00:00
Colin Cross 4f91766ca1 Merge "Remove protobuf vendorcompat from base_vendor.mk" am: 70ef3c1c9d
am: c43f0bff6d

Change-Id: Ic67fe3363dd5081e4f122bff7befaddc5ca1f9c3
2019-09-17 15:10:11 -07:00
Colin Cross c43f0bff6d Merge "Remove protobuf vendorcompat from base_vendor.mk"
am: 70ef3c1c9d

Change-Id: Iac8a423aa7b7fc2acecca0a651050d5f7ef67b15
2019-09-17 15:03:47 -07:00
Colin Cross 70ef3c1c9d Merge "Remove protobuf vendorcompat from base_vendor.mk" 2019-09-17 21:49:37 +00:00
Tao Bao d935a421d1 Merge "releasetools: Sanity check the build fingerprint." am: d5b6094ed3
am: 65f2333062

Change-Id: I30d1980385385e46004ee9631c9b3c11c711de61
2019-09-17 11:49:38 -07:00
Tao Bao 2771540c04 Merge "Also install verity_key to ramdisk for non-system-as-root target." am: e430f7652a
am: 6f756187fa

Change-Id: Iede385e6e40a190a39bba193b151466a222a3db8
2019-09-17 11:48:34 -07:00
Tao Bao 65f2333062 Merge "releasetools: Sanity check the build fingerprint."
am: d5b6094ed3

Change-Id: I6b2af3071e0cbbebddff959605f1b8afacc64c70
2019-09-17 11:44:21 -07:00
Tao Bao 6f756187fa Merge "Also install verity_key to ramdisk for non-system-as-root target."
am: e430f7652a

Change-Id: Ic001692c7cc750bca1e6f226937a874729c52c4a
2019-09-17 11:43:15 -07:00
Logan Chien d68b92fe14 Merge "Add check-elf-files as a checkbuild prerequisite" am: e34b4dea34
am: eb3c242228

Change-Id: Iec8366c2d00ae66b5f5fe298bb73873711725562
2019-09-17 11:31:19 -07:00
Tao Bao d5b6094ed3 Merge "releasetools: Sanity check the build fingerprint." 2019-09-17 18:30:45 +00:00
Tao Bao e430f7652a Merge "Also install verity_key to ramdisk for non-system-as-root target." 2019-09-17 18:25:55 +00:00
Logan Chien eb3c242228 Merge "Add check-elf-files as a checkbuild prerequisite"
am: e34b4dea34

Change-Id: Id30b1dabc63cc9ca21a47f746a4bc78cc6cb0077
2019-09-17 11:25:38 -07:00
Logan Chien e34b4dea34 Merge "Add check-elf-files as a checkbuild prerequisite" 2019-09-17 18:08:31 +00:00
Yifan Hong b33264718b Merge "extract-kernel: Fix indexing" am: 7ca2c1539f
am: 710d6b1773

Change-Id: Ic84a79e33d2d970dffee61039661e4d64cfe62cc
2019-09-17 10:18:25 -07:00
Yifan Hong 710d6b1773 Merge "extract-kernel: Fix indexing"
am: 7ca2c1539f

Change-Id: I2e5b85b177f7c941ebb0d4fada4be266d6a2ddae
2019-09-17 10:12:24 -07:00
Yifan Hong 7ca2c1539f Merge "extract-kernel: Fix indexing" 2019-09-17 16:50:36 +00:00
Tao Bao c99819311c Also install verity_key to ramdisk for non-system-as-root target.
The commit in d14b895665
(https://android-review.googlesource.com/c/platform/build/+/728287)
changed partition layout, to always build the root dir into system.img,
even for devices not using system-as-root (i.e. the ones with separate
boot ramdisk).

With the new layout, there will be two root dirs for non-system-as-root
targets during the boot. If such a device uses Verified Boot 1.0,
/verity_key needs to be available in both roots, to establish the chain
of trust.
 - bootloader uses the baked-in key to verify boot.img; it then loads
   the ramdisk from the verified boot.img
 - First stage init uses /verity_key (in ramdisk) to verify and mount
   system.img at /system, then chroot's to it
 - Second stage init uses /verity_key (in system.img) to verify and
   mount other partitions

This CL adds rules to additionally install verity_key into ramdisk for
such targets.

Bug: 139770257
Test: Set up a target to use non-system-as-root
      (BOARD_BUILD_SYSTEM_ROOT_IMAGE != true). `m dist`.
Test: Check that both ROOT/verity_key and BOOT/RAMDISK/verity_key exist
      in the built target_files.zip.
Test: Run validate_target_files to validate the above target_files.zip.
      $ validate_target_files \
          --verity_key_mincrypt /path/to/verity_key \
          target_files.zip
Test: Run sign_target_files_apks to sign the above target. Re-run
      validate_target_files on the signed target_files.zip.
Test: python -m unittest test_validate_target_files
Change-Id: Ibe7e771c8c376429add85851ac86055564765d3c
2019-09-17 08:53:16 -07:00
Tao Bao c4011cd719 releasetools: Sanity check the build fingerprint.
Bug: 140298338
Test: python -m unittest test_ota_from_target_files
Change-Id: I4add5f82d5b684c441b0484732da6991f8e7301a
2019-09-17 08:43:54 -07:00
Jaewoong Jung 301174329a Merge "Revert "Build: Fix test data no present in test suite zip files."" am: 9f2e68009d
am: 8ada3207fb

Change-Id: I59883ffc0ea9d12c325195e83a723f5b1acc5d2f
2019-09-17 07:29:20 -07:00